updated test scripts

DonJayamanne · DonJayamanne · commit 8954bdc107de · 2016-06-20T16:05:49.000+10:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,26 +1,16 @@
 language: python
 
-sudo: false
-
-os:
-  - osx
-  - linux
-
 matrix:
     include:
-        # Use the built in venv for linux builds
+        - os: linux
+          sudo: required
+          python: 3.7
         - os: linux
           sudo: required
           python: 3.5
-        # Use generic language for osx
-        - os: osx
-          language: generic
+
 # Perform the manual steps on osx to install python3 and activate venv
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then virtualenv venv -p python3; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source venv/bin/activate; fi
   - if [ $TRAVIS_OS_NAME == "linux" ]; then
       export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
       sh -e /etc/init.d/xvfb start;
diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts
@@ -11,18 +11,18 @@ import * as assert from "assert";
 import * as vscode from "vscode";
 import * as myExtension from "../client/extension";
 
-// Defines a Mocha test suite to group tests of similar kind together
-suite("Tests", () => {
+// // Defines a Mocha test suite to group tests of similar kind together
+// suite("Tests", () => {
 
-    // Defines a Mocha unit test
-    test("Something Formatting 1", () => {
-        assert.equal(1, [1, 2, 3].indexOf(5));
-        assert.equal(-1, [1, 2, 3].indexOf(0));
-    });
+//     // Defines a Mocha unit test
+//     test("Something Formatting 1", () => {
+//         assert.equal(1, [1, 2, 3].indexOf(5));
+//         assert.equal(-1, [1, 2, 3].indexOf(0));
+//     });
 
-    // Defines a Mocha unit test
-    test("Something Formatting 2", () => {
-        assert.equal(1, [1, 2, 3].indexOf(5));
-        assert.equal(-1, [1, 2, 3].indexOf(0));
-    });
-});
+//     // Defines a Mocha unit test
+//     test("Something Formatting 2", () => {
+//         assert.equal(1, [1, 2, 3].indexOf(5));
+//         assert.equal(-1, [1, 2, 3].indexOf(0));
+//     });
+// });
diff --git a/src/test/pythonFiles/formatting/beforeYapfFormatOnSave.py b/src/test/pythonFiles/formatting/beforeYapfFormatOnSave.py
@@ -1,36 +1,22 @@
 #
-import math, sys
-
+import math, sys;
 
 def example1():
     ####This is a long comment. This should be wrapped to fit within 72 characters.
-    some_tuple = (1, 2, 3, 'a')
-    some_variable = {'long':
-                     'Long code lines should be wrapped within 79 characters.',
-                     'other': [math.pi, 100, 200, 300, 9876543210,
-                               'This is a long string that goes on'],
-                     'more': {'inner':
-                              'This whole logical line should be wrapped.',
-                              some_tuple: [1, 20, 300, 40000, 500000000,
-                                           60000000000000000]}}
+    some_tuple=(   1,2, 3,'a'  );
+    some_variable={'long':'Long code lines should be wrapped within 79 characters.',
+    'other':[math.pi, 100,200,300,9876543210,'This is a long string that goes on'],
+    'more':{'inner':'This whole logical line should be wrapped.',some_tuple:[1,
+    20,300,40000,500000000,60000000000000000]}}
     return (some_tuple, some_variable)
-
-
-def example2():
-    return {'has_key() is deprecated': True}.has_key({'f': 2}.has_key(''))
-
-
-class Example3(object):
-    def __init__(self, bar):
-        #Comments should have a space after the hash.
-        if bar:
-            bar += 1
-            bar = bar * bar
-            return bar
-        else:
-            some_string = """
+def example2(): return {'has_key() is deprecated':True}.has_key({'f':2}.has_key(''));
+class Example3(   object ):
+    def __init__    ( self, bar ):
+     #Comments should have a space after the hash.
+     if bar : bar+=1;  bar=bar* bar   ; return bar
+     else:
+                    some_string = """
                        Indentation in multiline strings should not be touched.
 Only actual code should be reindented.
 """
-
-            return (sys.path, some_string)
+                    return (sys.path, some_string)
