Patch/appveyor tests (#22)

* improved appveyor functionality.

* renamed win_get template

Author: spyoungtech

ahk/templates/window/position.ahk ahk/templates/window/win_position.ahk

@@ -1,4 +1,4 @@
 {% extends "base.ahk" %}
 {% block body %}
 WinSet, {{subcommand}}, {{value}}, {{win.title}}, {{win.text}}, {{win._exclude_title}}, win._exclude_text}}
-{% endblock body %}
+{% endblock body %}

ahk/templates/window/set.ahk ahk/templates/window/win_set.ahk

@@ -3,7 +3,7 @@
 
 def make_logger(name):
     logger = logging.getLogger(name)
-    handler = logging.StreamHandler()
+    handler = logging.NullHandler()
     formatter = logging.Formatter(
             '%(asctime)s %(name)-12s %(levelname)-8s %(message)s')
     handler.setFormatter(formatter)

ahk/utils.py

@@ -25,15 +25,15 @@ def from_ahk_id(cls, engine, ahk_id):
         raise NotImplemented
 
     def _win_set(self, subcommand, value):
-        script = self.engine.render_template(win=self, subcommand=subcommand, value=value)
+        script = self.engine.render_template('window/win_set.ahk', win=self, subcommand=subcommand, value=value)
         return script
 
     def win_set(self, *args, **kwargs):
         script = self._win_set(*args, **kwargs)
         self.engine.run_script(script)
 
     def _position(self):
-        return self.engine.render_template('window/position.ahk', win=self)
+        return self.engine.render_template('window/win_position.ahk', win=self)
 
     def _get_pos(self):
         resp = self.engine.run_script(self._position())

ahk/window.py

@@ -5,7 +5,13 @@ environment:
   AHK_DEBUG: true
 
 install:
-  - appveyor DownloadFile https://github.com/Lexikos/AutoHotkey_L/releases/download/v1.1.30.01/AutoHotkey_1.1.30.01_setup.exe -FileName ahk_install.exe
+  - ps: |
+      if (!(Test-Path ahk_install.exe)) {
+          echo "Downloading AHK installer"
+          appveyor DownloadFile https://github.com/Lexikos/AutoHotkey_L/releases/download/v1.1.30.01/AutoHotkey_1.1.30.01_setup.exe -FileName ahk_install.exe
+      } else {
+          echo "Using cached installer"
+      }
   - ahk_install.exe /S /D=C:\ahk
   - cmd: .\ci\install.bat
 
@@ -17,20 +23,15 @@ artifacts:
     path: dist\*
 
 test_script:
-  - cmd: .\ci\runtests.bat
-  - ps: |
-       $wc = New-Object 'System.Net.WebClient';
-       Get-ChildItem .\reports |
-       Foreach-Object {
-           $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $_.FullName))
-       }
-
+  - powershell .\ci\runtests.ps1
 
-on_success:
+on_finish:
   - cmd: |
       venv\Scripts\activate.bat
       python -m coveralls
 
+cache:
+  - ahk_install.exe -> appveyor.yml
 
 deploy_script:
   - ps: |

appveyor.yml

@@ -0,0 +1,18 @@
+.\venv\Scripts\activate.ps1
+coverage run -m behave .\tests\features --format=progress2 --junit
+if ($LastExitCode -ne 0) {
+  $failure = 1
+} else {
+  $failure = 0
+}
+coverage run -a -m pytest .\tests\unittests --junitxml=reports\pytestresults.xml
+if ($LastExitCode -ne 0) {
+  $failure = 1
+}
+$wc = New-Object 'System.Net.WebClient';
+Get-ChildItem .\reports |
+Foreach-Object {
+   $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $_.FullName))
+}
+if ($failure -ne 0) { throw }
+deactivate