Wget presto rpm before running tests

Author: zachyee

.travis.yml

@@ -27,6 +27,7 @@ install:
   - pip install -r requirements.txt
 before_script:
   - make docker-images
+  - make presto-server-rpm.rpm
 script:
   - |
     if [ -v PRODUCT_TEST_GROUP_SA_BARE ]; then

Makefile

@@ -13,6 +13,7 @@ help:
 	@echo "clean-test - remove test and coverage artifacts"
 	@echo "clean-docs - remove doc artifacts"
 	@echo "lint - check style with flake8"
+	@echo "get-presto-rpm - download the presto rpm"
 	@echo "smoke - run tests annotated with attr smoke using nosetests"
 	@echo "test - run tests quickly with Python 2.6 and 2.7"
 	@echo "test-all - run tests on every Python version with tox. Specify TEST_SUITE env variable to run only a given suite."
@@ -72,6 +73,9 @@ clean-docs:
 lint:
 	flake8 prestoadmin packaging tests
 
+presto-server-rpm.rpm:
+	wget 'https://repository.sonatype.org/service/local/artifact/maven/content?r=central-proxy&g=com.facebook.presto&a=presto-server-rpm&e=rpm&v=RELEASE' -O $@
+
 smoke: clean-test docker-images
 	tox -e py26 -- -a smoketest,'!quarantine'
 

tests/product/standalone/presto_installer.py

@@ -18,7 +18,6 @@
 
 import fnmatch
 import os
-import urllib
 
 import prestoadmin
 
@@ -102,27 +101,10 @@ def copy_presto_rpm_to_master(self, cluster=None):
             cluster = self.testcase.cluster
 
         rpm_path = os.path.join(self.rpm_dir, self.rpm_name)
-        try:
-            cluster.copy_to_host(rpm_path, cluster.master)
-            self._check_if_corrupted_rpm(self.rpm_name, cluster)
-        except OSError:
-            print 'Downloading RPM again'
-            # try to download the RPM again if it's corrupt (but only once)
-            StandalonePrestoInstaller._download_rpm()
-            cluster.copy_to_host(rpm_path, cluster.master)
-            self._check_if_corrupted_rpm(self.rpm_name, cluster)
+        cluster.copy_to_host(rpm_path, cluster.master)
+        self._check_if_corrupted_rpm(self.rpm_name, cluster)
         return self.rpm_name
 
-    @staticmethod
-    def _download_rpm():
-        rpm_filename = 'presto-server-rpm.rpm'
-        rpm_path = os.path.join(prestoadmin.main_dir,
-                                rpm_filename)
-        urllib.urlretrieve(
-            'http://search.maven.org/remotecontent?filepath=com/facebook/presto/'
-            'presto-server-rpm/0.148/presto-server-rpm-0.148.rpm', rpm_path)
-        return rpm_filename
-
     @staticmethod
     def _detect_presto_rpm():
         """
@@ -136,11 +118,7 @@ def _detect_presto_rpm():
             # are multiple RPMs, the last one is probably the latest
             rpm_name = sorted(rpm_names)[-1]
         else:
-            try:
-                rpm_name = StandalonePrestoInstaller._download_rpm()
-            except:
-                # retry once
-                rpm_name = StandalonePrestoInstaller._download_rpm()
+            raise OSError(1, 'Presto RPM not detected.')
 
         return prestoadmin.main_dir, rpm_name