feature(ZENKO-855): Enable one to many replication tests in eve

scality · Jul 27, 2018 · b501a41 · b501a41
1 parent 3cbafe8
commit b501a41
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/eve/workers/ci_env.sh b/eve/workers/ci_env.sh
@@ -57,7 +57,8 @@ FLAGS="\
 --$CLI_FLAG ${CI_PREFIX}GCP_BACKEND_DESTINATION_LOCATION=$GCP_BACKEND_DESTINATION_LOCATION \
 --$CLI_FLAG ${CI_PREFIX}GCP_BACKEND_SERVICE_KEY=$GCP_PRIV_KEY \
 --$CLI_FLAG ${CI_PREFIX}GCP_BACKEND_SERVICE_EMAIL=$GCP_BACKEND_SERVICE_EMAIL \
---$CLI_FLAG INSTALL_TIMEOUT=$INSTALL_TIMEOUT"
+--$CLI_FLAG INSTALL_TIMEOUT=$INSTALL_TIMEOUT \
+--$CLI_FLAG ${CI_PREFIX}MULTI_CRR_SRC_BUCKET=$MULTI_CRR_SRC_BUCKET"
 
 if [ ! -z "$ZENKO_ACCESS_KEY" ]; then
 	FLAGS="$FLAGS --$CLI_FLAG ${CI_PREFIX}ZENKO_ACCESS_KEY=$ZENKO_ACCESS_KEY"

diff --git a/tests/zenko_e2e/cloudserver/test_replication.py b/tests/zenko_e2e/cloudserver/test_replication.py
@@ -60,7 +60,6 @@ def test_wasabi_1_1(wasabi_crr_bucket,
         timeout=30)
 
 
-@pytest.mark.skip(reason='Not implemented in CI')
 @pytest.mark.parametrize('datafile', [testfile, mpufile])
 @pytest.mark.conformance
 def test_multi_1_M(  # pylint: disable=invalid-name, too-many-arguments
@@ -73,9 +72,9 @@ def test_multi_1_M(  # pylint: disable=invalid-name, too-many-arguments
     util.mark_test("MULTI 1-M REPLICATION")
     data = datafile()
     util.upload_object(multi_crr_bucket, objkey, data)
-    assert util.check_object(objkey, testfile,
+    assert util.check_object(objkey, data,
                              multi_crr_bucket,
                              aws_crr_target_bucket,
                              gcp_crr_target_bucket,
                              azure_crr_target_bucket,
-                             timeout=30)
+                             timeout=120)
diff --git a/tests/zenko_e2e/fixtures/bucket.py b/tests/zenko_e2e/fixtures/bucket.py
@@ -236,7 +236,7 @@ def digital_ocean_crr_bucket(zenko_resource):
 
 
 @pytest.fixture(scope='function')
-def muti_crr_bucket(zenko_resource):
+def multi_crr_bucket(zenko_resource):
     bucket = create_bucket(zenko_resource, conf.MULTI_CRR_SRC_BUCKET)
     util.bucket_safe_create(bucket)
     yield bucket