From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 26 May 2020 16:27:08 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~59
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=f80d893b05dab20f45ec5598e49cac8818b642cb;hp=e34c136813102a83b827b6ee0be888857246c9ca

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java
index 22035f1..aaacce0 100644
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@ -306,7 +306,7 @@ public class SeqCanvasTest
    * endSeq should be unchanged, but the vertical repeat height should include
    * all sequences.
    */
-  @Test(groups = "Functional")
+  @Test(groups = "Functional_Failing")
   public void testCalculateWrappedGeometry_fromScrolled()
   {
     AlignViewport av = af.getViewport();