fix progress tests on travis

we now check if we really have a terminal before doing the fancy auto-detection testing

borg/testsuite/archiver.py

@@ -670,6 +670,19 @@ class ArchiverTestCase(ArchiverTestCaseBase):
         self.assert_equal(len(manifest.archives), 0)
 
     def test_progress(self):
+        self.create_regular_file('file1', size=1024 * 80)
+        self.cmd('init', self.repository_location)
+        # progress forced on
+        output = self.cmd('create', '--progress', self.repository_location + '::test4', 'input')
+        self.assert_in("\r", output)
+        # progress forced off
+        output = self.cmd('create', '--no-progress', self.repository_location + '::test5', 'input')
+        self.assert_not_in("\r", output)
+
+    @unittest.skipUnless(sys.stdout.isatty(), 'need a tty to test auto-detection')
+    def test_progress_tty(self):
+        """test that the --progress and --no-progress flags work,
+        overriding defaults from the terminal auto-detection"""
         self.create_regular_file('file1', size=1024 * 80)
         self.cmd('init', self.repository_location)
         # without a terminal, no progress expected