Merge lp:~marcustomlinson/unity-scopes-api/locate_test_order_fix into lp:unity-scopes-api/devel

[Marcus Tomlinson]

Start scope-C and scope-D before starting scope-B in RegistryI_test, as B aggregates C and D. (When re-binding logic is introduced, this will be unnecessary)

[lp:~marcustomlinson/unity-scopes-api/locate_test_order_fix]

289. By Marcus Tomlinson on 2014-03-31

Added comment to test to be addressed when re-binding in added

[Michal Hruby (mhr3)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2014-03-24 10:19:35 +0000
+++ test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2014-03-31 17:27:14 +0000
@@ -423,7 +423,10 @@
         mw->add_registry_object(reg_id, reg);
 
         // configure scopes
-        std::array<std::string, 6> scope_ids = {"scope-A", "scope-B", "scope-C", "scope-D", "scope-N", "scope-S"};
+        ///! TODO: HACK:
+        /// we have to start scope-C and scope-D before starting scope-B here, as B aggregates C and D.
+        /// (When re-binding logic is introduced, this will be unnecessary)
+        std::array<std::string, 6> scope_ids = {"scope-A", "scope-C", "scope-D", "scope-B", "scope-N", "scope-S"};
         std::map<std::string, ScopeProxy> proxies;
 
         for (auto& scope_id : scope_ids)