Disable FTP tests in Travis

.travis.yml

@@ -22,6 +22,7 @@ env:
     - secure: "YSwtFrMqh4oUvdSQTXBXMHHLWeQgyNEL23ChIZwU0nuDGIcQZ65kipu0PzefedtUbK4ieC065YCUi4UDDh6gPotB/Wu1pnYg3dyQ7rFvhaVYAAUEpajAdXZhlx+7+J8a4FZMeC/kqiahxoRgLbthF9019ouIqhGB9zHKI6/yZwc="
     - secure: "V7OjWrfQ8UbktgT036jYQPb/7GJT3Ol9LObDr8FYlzsQ+F1uj2wLac6ePuxcOS4FwWOJinWGM1h+JiFkbxbyFqfRNJ0jj0O2p93QyDojxFVOn1mXqqvV66KFqAWR2Vzkny/gDvj8LTvdB1cgAIm2FNOkQc6E1BFnyWS2sN9ea5E="
     - secure: "OxiVNmre2JzUszwPNNilKDgIqtfX2gnRSsVz6nuySB1uO2yQsOQmKWJ9cVYgH2IB5H8eWXKOhexcSE28kz6TPLRuEcU9fnqKY3uEkdwm7rJfz9lf+7C4bJEUdA1OIzJppjnWUiXxD7CEPL1DlnMZM24eDQYqa/4WKACAgkK53gE="
+    - NO_FTP_ACCESS: "yes"
 before_install:
   - virtualenv system/env
   - . system/env/bin/activate

system/lib.py

@@ -61,6 +61,7 @@ class BaseTest(object):
     fixtureDB = False
     fixtureGpg = False
     fixtureWebServer = False
+    requiresFTP = False
 
     expectedCode = 0
     configFile = {
@@ -118,6 +119,8 @@ class BaseTest(object):
             return False
         if self.fixtureDB and not os.path.exists(self.fixtureDBDir):
             return False
+        if self.requiresFTP and os.environ.get('NO_FTP_ACCESS', '') == 'yes':
+            return False
 
         return True
 

system/t04_mirror/edit.py

@@ -107,5 +107,6 @@ class EditMirror10Test(BaseTest):
     """
     edit mirror: change archive url
     """
+    requiresFTP = True
     fixtureCmds = ["aptly mirror create -ignore-signatures mirror10 ftp://ftp.ru.debian.org/debian wheezy main"]
     runCmd = "aptly mirror edit -ignore-signatures -archive-url ftp://ftp.ch.debian.org/debian mirror10"

system/t04_mirror/update.py

@@ -155,6 +155,7 @@ class UpdateMirror11Test(BaseTest):
     """
     longTest = False
     fixtureGpg = True
+    requiresFTP = True
     fixtureCmds = [
         "aptly mirror create -keyring=aptlytest.gpg -filter='Priority (required), Name (% s*)' -architectures=i386 wheezy-main ftp://ftp.ru.debian.org/debian/ wheezy main",
     ]