You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by na...@apache.org on 2016/07/29 19:08:55 UTC

samza git commit: SAMZA-970 : Problems with integration tests

Repository: samza
Updated Branches:
  refs/heads/master 40445e2c6 -> 97a3be397


SAMZA-970 : Problems with integration tests


Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/97a3be39
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/97a3be39
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/97a3be39

Branch: refs/heads/master
Commit: 97a3be397812568e4aec0dffd5b18c0504cd1f67
Parents: 40445e2
Author: Xinyu Liu <xi...@linkedin.com>
Authored: Fri Jul 29 12:08:34 2016 -0700
Committer: Navina Ramesh <nr...@linkedin.com>
Committed: Fri Jul 29 12:08:34 2016 -0700

----------------------------------------------------------------------
 bin/integration-tests.sh                              | 2 +-
 samza-test/src/main/python/configs/tests.json         | 2 +-
 samza-test/src/main/python/requirements.txt           | 4 ++--
 samza-test/src/main/python/samza_job_yarn_deployer.py | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/samza/blob/97a3be39/bin/integration-tests.sh
----------------------------------------------------------------------
diff --git a/bin/integration-tests.sh b/bin/integration-tests.sh
index af00b5f..7ed8dae 100755
--- a/bin/integration-tests.sh
+++ b/bin/integration-tests.sh
@@ -51,7 +51,7 @@ cp ./samza-test/build/distributions/samza-test*.tgz $ABS_TEST_DIR
 cd $ABS_TEST_DIR
 
 # setup virtualenv locally if it's not already there
-VIRTUAL_ENV=virtualenv-12.0.2
+VIRTUAL_ENV=virtualenv-15.0.1
 if [[ ! -d "${ABS_TEST_DIR}/${VIRTUAL_ENV}" ]] ; then
   curl -O https://pypi.python.org/packages/source/v/virtualenv/$VIRTUAL_ENV.tar.gz
   tar xvfz $VIRTUAL_ENV.tar.gz

http://git-wip-us.apache.org/repos/asf/samza/blob/97a3be39/samza-test/src/main/python/configs/tests.json
----------------------------------------------------------------------
diff --git a/samza-test/src/main/python/configs/tests.json b/samza-test/src/main/python/configs/tests.json
index 30be820..8feb5b9 100644
--- a/samza-test/src/main/python/configs/tests.json
+++ b/samza-test/src/main/python/configs/tests.json
@@ -1,5 +1,5 @@
 {
-  "samza_executable": "samza-test_2.10-0.10.0-SNAPSHOT.tgz",
+  "samza_executable": "samza-test_2.10-0.11.0-SNAPSHOT.tgz",
   "samza_install_path": "deploy/smoke_tests",
   "samza_config_factory": "org.apache.samza.config.factories.PropertiesConfigFactory"
 }

http://git-wip-us.apache.org/repos/asf/samza/blob/97a3be39/samza-test/src/main/python/requirements.txt
----------------------------------------------------------------------
diff --git a/samza-test/src/main/python/requirements.txt b/samza-test/src/main/python/requirements.txt
index 2ae9590..e1f8c49 100644
--- a/samza-test/src/main/python/requirements.txt
+++ b/samza-test/src/main/python/requirements.txt
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-zopkio
+zopkio==0.2.5
 requests
-kafka-python
+kafka-python==1.2.5
 Jinja2

http://git-wip-us.apache.org/repos/asf/samza/blob/97a3be39/samza-test/src/main/python/samza_job_yarn_deployer.py
----------------------------------------------------------------------
diff --git a/samza-test/src/main/python/samza_job_yarn_deployer.py b/samza-test/src/main/python/samza_job_yarn_deployer.py
index 38635ca..e0e3274 100644
--- a/samza-test/src/main/python/samza_job_yarn_deployer.py
+++ b/samza-test/src/main/python/samza_job_yarn_deployer.py
@@ -276,6 +276,9 @@ class SamzaJobYarnDeployer(Deployer):
   def get_logs(self, container_id, logs, directory):
     raise NotImplementedError
 
+  def kill_all_process(self):
+    pass
+
   def _validate_configs(self, configs, config_keys):
     for required_config in config_keys:
       assert configs.get(required_config), 'Required config is undefined: {0}'.format(required_config)