Add undo/redo smoke tests for annotations (#1175)

* Add undo/redo tests for annotations

Fixes https://github.com/chanzuckerberg/cellxgene/issues/969

... also refactor the tests for DRY.

* Add done()

* Make e2e annotations tests safer to concurrency

* Add data-testclass for save state.

* Simplify tests and make them dependent on save state

server/test/test_api.py

@@ -272,7 +272,7 @@ class EndPointsAnnotations(EndPoints):
 
     def test_get_user_annotations_existing_obs_keys_fbs(self):
         self._test_get_user_annotations_obs_keys_fbs(
-            "cluster-test", {"unassigned", "one", "two", "three", "four", "five"},
+            "cluster-test", {"unassigned", "one", "two", "three", "four", "five", "six", "seven"},
         )
 
     def test_put_user_annotations_obs_fbs(self):

server/test/test_datasets/pbmc3k-annotations.csv

@@ -1,5 +1,5 @@
-# Annotations generated on 2020-02-07T16:48:13 using cellxgene version 0.14.0
-# Input data file was ../example-dataset/pbmc3k.h5ad, which was last modified on 2019-12-17T17:13:17
+# Annotations generated on 2020-02-24T23:19:31 using cellxgene version 0.14.0
+# Input data file was example-dataset/pbmc3k.h5ad, which was last modified on 2019-12-17T17:13:17
 index,cluster-test
 AAACATACAACCAC-1,four
 AAACATTGAGCTAC-1,three
@@ -27,7 +27,7 @@ AAAGTTTGTAGCGT-1,two
 AAATCAACAATGCC-1,three
 AAATCAACACCAGT-1,four
 AAATCAACCAGGAG-1,four
-AAATCAACCCTATT-1,unassigned
+AAATCAACCCTATT-1,seven
 AAATCAACGGAAGC-1,four
 AAATCAACTCGCAA-1,four
 AAATCATGACCACA-1,one
@@ -245,7 +245,7 @@ ACCCAAGAGGACAG-1,four
 ACCCAAGATTCACT-1,three
 ACCCACTGCGCCTT-1,two
 ACCCACTGGACAGG-1,four
-ACCCACTGGTTCAG-1,one
+ACCCACTGGTTCAG-1,six
 ACCCACTGTCGTAG-1,two
 ACCCAGCTCAGAAA-1,four
 ACCCAGCTGTTAGC-1,two
@@ -271,7 +271,7 @@ ACCTTTGACTCCCA-1,two
 ACCTTTGAGGAACG-1,two
 ACCTTTGAGGAAGC-1,one
 ACGAACACCTTGTT-1,five
-ACGAACTGGCTATG-1,one
+ACGAACTGGCTATG-1,six
 ACGAAGCTCTCCAC-1,four
 ACGAAGCTCTGAGT-1,three
 ACGACCCTATCTCT-1,one
@@ -545,7 +545,7 @@ AGTCTACTAGGGTG-1,two
 AGTCTACTTGCATG-1,one
 AGTCTTACACCACA-1,four
 AGTCTTACTTCGCC-1,five
-AGTCTTACTTCGGA-1,one
+AGTCTTACTTCGGA-1,six
 AGTGACTGCAACTG-1,one
 AGTGTTCTAACCTG-1,four
 AGTGTTCTATAAGG-1,four
@@ -630,7 +630,7 @@ ATCAACCTTCTCTA-1,five
 ATCAACCTTTGTCT-1,five
 ATCACACTTTGTCT-1,four
 ATCACGGATTTCGT-1,three
-ATCATCTGACACCA-1,one
+ATCATCTGACACCA-1,six
 ATCATGCTAGAGTA-1,five
 ATCATGCTGAACCT-1,three
 ATCCAGGACGCTAA-1,one
@@ -745,7 +745,7 @@ ATTAGATGTTTCAC-1,four
 ATTATGGAATCTCT-1,four
 ATTCAAGAACGGGA-1,four
 ATTCAAGACCTTTA-1,four
-ATTCAGCTCATTGG-1,one
+ATTCAGCTCATTGG-1,six
 ATTCCAACCATTGG-1,two
 ATTCCAACTTAGGC-1,five
 ATTCGACTCACTAG-1,four
@@ -946,7 +946,7 @@ CATAACCTTCTCCG-1,four
 CATACTACCTCGAA-1,four
 CATACTACCTGAAC-1,four
 CATACTACGTACCA-1,two
-CATACTTGGGTTAC-1,four
+CATACTTGGGTTAC-1,seven
 CATAGTCTAATCGC-1,four
 CATAGTCTCACTTT-1,four
 CATATAGACTAAGC-1,unassigned
@@ -1523,7 +1523,7 @@ GACCTCTGCATCAG-1,four
 GACGAACTCCCACT-1,four
 GACGATTGCCAATG-1,three
 GACGCCGACCTTCG-1,four
-GACGCTCTCTCTCG-1,one
+GACGCTCTCTCTCG-1,six
 GACGGCACACGGGA-1,five
 GACGGCACGAGATA-1,two
 GACGTAACCTATGG-1,four
@@ -1589,7 +1589,7 @@ GAGTGTTGTGGTCA-1,four
 GAGTTGTGCATGGT-1,unassigned
 GAGTTGTGCTGAGT-1,five
 GAGTTGTGGCGAGA-1,two
-GAGTTGTGGTAGCT-1,one
+GAGTTGTGGTAGCT-1,six
 GAGTTGTGTATGCG-1,one
 GATAAGGAGAAACA-1,two
 GATAAGGATTCACT-1,two
@@ -1735,7 +1735,7 @@ GCGATATGGTGTTG-1,four
 GCGCACGAAGTCGT-1,four
 GCGCACGACTTTAC-1,two
 GCGCATCTAGGTCT-1,four
-GCGCATCTGGTTAC-1,one
+GCGCATCTGGTTAC-1,six
 GCGCATCTTCGATG-1,four
 GCGCATCTTGCTCC-1,five
 GCGCATCTTTCTAC-1,four
@@ -1779,7 +1779,7 @@ GCTTAACTGCTGAT-1,four
 GCTTAACTTAGACC-1,two
 GCTTAACTTCAGTG-1,four
 GGAACACTCACTTT-1,two
-GGAACACTTCAGAC-1,one
+GGAACACTTCAGAC-1,six
 GGAACTACTACTTC-1,four
 GGAACTTGAAGGTA-1,two
 GGAACTTGAGAATG-1,four
@@ -1841,7 +1841,7 @@ GGCAATACGTTTCT-1,three
 GGCACGTGGCTTAG-1,one
 GGCACTCTTTTGTC-1,four
 GGCATATGCTTATC-1,five
-GGCATATGGGGAGT-1,one
+GGCATATGGGGAGT-1,six
 GGCATATGTGTGAC-1,unassigned
 GGCCACGACAGAGG-1,four
 GGCCAGACTGGTTG-1,four
@@ -1977,7 +1977,7 @@ GTCACCTGCCTCCA-1,four
 GTCACCTGTCCCGT-1,four
 GTCATACTAATCGC-1,three
 GTCATACTGCGATT-1,five
-GTCATACTTCGCCT-1,one
+GTCATACTTCGCCT-1,six
 GTCATACTTTACCT-1,five
 GTCATACTTTGACG-1,four
 GTCCAAGAAAAACG-1,four
@@ -2044,7 +2044,7 @@ TAAATCGATGAGGG-1,four
 TAACAATGTGCCCT-1,three
 TAACACCTTCGCTC-1,two
 TAACACCTTCGTAG-1,two
-TAACACCTTGTTTC-1,one
+TAACACCTTGTTTC-1,six
 TAACATGACACTAG-1,three
 TAACCGGACTTACT-1,four
 TAACGTCTCAACCA-1,two
@@ -2507,7 +2507,7 @@ TTACCATGTGTCTT-1,four
 TTACCATGTTGTGG-1,three
 TTACGACTGAGAGC-1,four
 TTACGACTTGACAC-1,two
-TTACGTACGTTCAG-1,one
+TTACGTACGTTCAG-1,six
 TTACTCGAAGAATG-1,two
 TTACTCGACGCAAT-1,unassigned
 TTACTCGAGGGTGA-1,four