Переглянути джерело

[core] Make desktop tests pass on Oracle DB

Jenny Kim 10 роки тому
батько
коміт
3bb0f3d

+ 1 - 1
desktop/core/src/desktop/api_tests.py

@@ -135,7 +135,7 @@ class TestDocModelTags():
         {"id": default_tag.id, "name": "default"},
         {"id": tag1_id, "name": "update_tags_1"},
         {"id": tag2_id, "name": "update_tags_2"}
-      ], content['doc']['tags'])
+      ], sorted(content['doc']['tags'], key=lambda t: t['id']))
 
     # No perms
     response = self.client_not_me.post("/desktop/api/doc/update_tags", {'data': json.dumps({'doc_id': doc.id, 'tag_ids': [tag1_id, tag2_id]})})

+ 1 - 1
desktop/core/src/desktop/auth/views_test.py

@@ -377,7 +377,7 @@ class TestRemoteUserLogin(PseudoHdfsTestBase):
     response = self.c.post('/accounts/login/', {}, **{"REMOTE_USER": "%s_%s" % (self.test_username.upper(), '2')})
     assert_equal(200, response.status_code, "Expected ok status.")
     assert_equal(2, len(User.objects.all().order_by('username')))
-    assert_equal("%s_%s" % (self.test_username, '2'), User.objects.all()[1].username)
+    assert_equal("%s_%s" % (self.test_username, '2'), User.objects.all().order_by('username')[1].username)
 
     response = self.c.post('/accounts/login/', {}, **{"REMOTE_USER": "%s_%s" % (self.test_username, '2')})
     assert_equal(200, response.status_code, "Expected ok status.")