• anonym's avatar
    Test suite: fixes to make 3.0~beta3 pass. · b715ce42
    anonym authored
    This includes:
    * fixing some mistakes in the merge conflict resolution
    * switching to an image in the Pidgin tests that doesn't depend on the
      /topic of tails@conference.riseup.net -- the server resets it every
      once in a while, so we should not pretend the test suite can always
      find it.
    * Fix a problematic use of try_for (we need refs: #9223!).
    * Fix for VM.select_virtual_desktop() and VM.do_focus(): in Stretch we
      only have two virtual desktop, so do_focus() has been broken for a
      while. Also add some `sleep()`:s which sadly seem required.
    * Random Gherkin improvement.