From efe16964104ed28f37013e57c8a90d3d57376069 Mon Sep 17 00:00:00 2001
From: Vlad Zolotarov <vladz@cloudius-systems.com>
Date: Tue, 23 Jun 2015 16:32:41 +0300
Subject: [PATCH] cql_test_env: Start the global snitch before storage service

This order is required since 5e1348e7415cc0fee7fd99c2596dfe278262dfbe
(storage_service: Use get_local_snitch_ptr in gossip_snitch_info).

This fixes the breakage in the cql_query_test.

Reported-by: Asias He <asias@cloudius-systems.com>
Signed-off-by: Vlad Zolotarov <vladz@cloudius-systems.com>
---
 tests/urchin/cql_test_env.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/urchin/cql_test_env.cc b/tests/urchin/cql_test_env.cc
index 3fdd6210e3..5fe252beef 100644
--- a/tests/urchin/cql_test_env.cc
+++ b/tests/urchin/cql_test_env.cc
@@ -197,9 +197,8 @@ future<> init_once() {
 }
 
 future<::shared_ptr<cql_test_env>> make_env_for_test() {
-    return init_once().then([] {
-        using namespace locator;
-        return i_endpoint_snitch::create_snitch("org.apache.cassandra.locator.SimpleSnitch").then([] {
+    return locator::i_endpoint_snitch::create_snitch("SimpleSnitch").then([] {
+        return init_once().then([] {
             auto db = ::make_shared<distributed<database>>();
             auto cfg = make_lw_shared<db::config>();
             cfg->data_file_directories() = {};