3036: Fix merge conflicts. One python sdk test still fails.

diff --git a/sdk/python/tests/test_arv_put.py b/sdk/python/tests/test_arv_put.py
index 7fd073080a45e5fd542143654a6adb70bd8e5fbe..66af47a419201dfe82ea752f08c43bc7bd4833ce 100644 (file)
--- a/sdk/python/tests/test_arv_put.py
+++ b/sdk/python/tests/test_arv_put.py
@@ -579,7 +579,7 @@ class ArvPutIntegrationTest(run_test_server.TestCaseWithServers,
             stderr=subprocess.PIPE, env=self.ENVIRON)
         stdout, stderr = pipe.communicate(text)
         collection_list = arvados.api('v1', cache=False).collections().list(
-            filters=[['uuid', '=', stdout.strip()]]).execute().get('items', [])
+            filters=[['portable_data_hash', '=', stdout.strip()]]).execute().get('items', [])
         self.assertEqual(1, len(collection_list))
         return collection_list[0]
 

diff --git a/services/api/db/migrate/20140815171049_add_name_description_columns.rb b/services/api/db/migrate/20140815171049_add_name_description_columns.rb
deleted file mode 100644 (file)
index c0c8f6a..0000000
--- a/services/api/db/migrate/20140815171049_add_name_description_columns.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class AddNameDescriptionColumns < ActiveRecord::Migration
-  def up
-    add_column :jobs, :name, :string
-    add_column :jobs, :description, :text
-    add_column :pipeline_instances, :description, :text
-  end
-
-  def down
-    remove_column :jobs, :name
-    remove_column :jobs, :description
-    remove_column :pipeline_instances, :description
-  end
-end

diff --git a/services/api/db/migrate/20140817035914_add_unique_name_constraints.rb b/services/api/db/migrate/20140817035914_add_unique_name_constraints.rb
index f84c6352e0963188826c7bf562c1e904ffdb4e5e..3b7eecc287c0e5e3fbbe4d282f4b708a57e95ee7 100644 (file)
--- a/services/api/db/migrate/20140817035914_add_unique_name_constraints.rb
+++ b/services/api/db/migrate/20140817035914_add_unique_name_constraints.rb
@@ -24,10 +24,6 @@ update #{table} set name='#{r["name"]} #{n}' where uuid='#{r["uuid"]}'
               name: 'collection_owner_uuid_name_unique')
     add_index(:pipeline_templates, [:owner_uuid, :name], unique: true,
               name: 'pipeline_template_owner_uuid_name_unique')
-    add_index(:pipeline_instances, [:owner_uuid, :name], unique: true,
-              name: 'pipeline_instance_owner_uuid_name_unique')
-    add_index(:jobs, [:owner_uuid, :name], unique: true,
-              name: 'jobs_owner_uuid_name_unique')
     add_index(:groups, [:owner_uuid, :name], unique: true,
               name: 'groups_owner_uuid_name_unique')
   end

diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index 06e327ffdf8a08862f96131575a35f3b89c92fb3..af4bf6a9f23145bd989d169446186007b550afb0 100644 (file)
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -2024,4 +2024,4 @@ INSERT INTO schema_migrations (version) VALUES ('20140815171049');
 
 INSERT INTO schema_migrations (version) VALUES ('20140817035914');
 
-INSERT INTO schema_migrations (version) VALUES ('20140818125735');
+INSERT INTO schema_migrations (version) VALUES ('20140818125735');
\ No newline at end of file

diff --git a/services/api/test/fixtures/groups.yml b/services/api/test/fixtures/groups.yml
index a3f75cdcaced9a8a111daa68fbb1000bb010e17c..f0e2d0555d684bf167a62e3efb7a99654081a2dc 100644 (file)
--- a/services/api/test/fixtures/groups.yml
+++ b/services/api/test/fixtures/groups.yml
@@ -28,12 +28,6 @@ activeandfriends:
   updated_at: 2014-08-22 14:02:18.481166435 Z
   group_class:
 
-system_owned_group:
-  uuid: zzzzz-j7d0g-8ulrifv67tve5sx
-  owner_uuid: zzzzz-tpzed-000000000000000
-  name: System Private
-  description: System-owned Group
-
 system_group:
   uuid: zzzzz-j7d0g-000000000000000
   owner_uuid: zzzzz-tpzed-000000000000000