Profile automation for tests + Travis build.

jsha · jsha · commit 57f21c8c9ac3 · 2014-08-11T21:15:35.000-04:00
Incidentally fix a regex that generates 'nothing to repeat' error on Python
2.7.8.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,19 @@
+# Config copied from
+#  http://www.theautomatedtester.co.uk/blog/2012/using-travis-ci-for-building-and-testing-firefox-addons.html
+# Use node_js because there are maybe more workers?
 language: python
 python:
   - "2.7"
+addons:
+  firefox: "30.0"
 before_install:
-  - "sudo apt-get -qq update"
-install:
-  - "sudo apt-get -qq install libxml2-dev libxslt-dev python-dev"
-  - "pip install -r requirements.txt"
-script: "./makexpi.sh"
+  - wget -q https://ftp.mozilla.org/pub/mozilla.org/labs/jetpack/addon-sdk-1.16.tar.gz
+  - tar xpzf addon-sdk-1.16.tar.gz
+  - cd addon-sdk-1.16; source bin/activate; cd -
+  - sudo apt-get install python-lxml
+  #- pip install --user -r requirements.txt
+before_script:
+  - sh -e /etc/init.d/xvfb start
+env:
+  - DISPLAY=':99.0'
+script: ./test.sh
diff --git a/https-everywhere-tests/test_profile_skeleton/extensions.ini b/https-everywhere-tests/test_profile_skeleton/extensions.ini
@@ -0,0 +1,7 @@
+[ExtensionDirs]
+Extension0=/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com
+Extension1=/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{2e1445b0-2682-11e1-bfc2-0800200c9a66}
+Extension2=/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/online-accounts@lists.launchpad.net
+
+[ThemeDirs]
+Extension0=/usr/lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
diff --git a/https-everywhere-tests/test_profile_skeleton/extensions.json b/https-everywhere-tests/test_profile_skeleton/extensions.json
@@ -0,0 +1,65 @@
+{
+    "addons": [
+        {
+            "aboutURL": "chrome://https-everywhere/content/about.xul",
+            "active": false,
+            "appDisabled": false,
+            "applyBackgroundUpdates": 1,
+            "bootstrap": false,
+            "defaultLocale": {
+                "creator": "Mike Perry & Peter Eckersley",
+                "description": "Encrypt the Web! Automatically use HTTPS security on many sites.",
+                "homepageURL": "https://www.eff.org/https-everywhere",
+                "name": "HTTPS-Everywhere"
+            },
+            "descriptor": "/home/jsha/https-everywhere/https-everywhere-tests/test_profile/extensions/https-everywhere@eff.org",
+            "foreignInstall": true,
+            "hasBinaryComponents": false,
+            "icon64URL": null,
+            "iconURL": "chrome://https-everywhere/skin/https-everywhere.png",
+            "id": "https-everywhere@eff.org",
+            "installDate": 1407525887000,
+            "internalName": null,
+            "locales": [],
+            "location": "app-profile",
+            "optionsType": null,
+            "optionsURL": "chrome://https-everywhere/content/meta-preferences.xul",
+            "releaseNotesURI": null,
+            "size": 5133044,
+            "softDisabled": false,
+            "sourceURI": null,
+            "strictCompatibility": false,
+            "syncGUID": "PbynBLfrwhTP",
+            "targetApplications": [
+                {
+                    "id": "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}",
+                    "maxVersion": "99.*",
+                    "minVersion": "20"
+                },
+                {
+                    "id": "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}",
+                    "maxVersion": "99.*",
+                    "minVersion": "2.17"
+                },
+                {
+                    "id": "{3550f703-e582-4d05-9a08-453d09bdfdc6}",
+                    "maxVersion": "99.*",
+                    "minVersion": "17.0.5"
+                },
+                {
+                    "id": "{a79fe89b-6662-4ff4-8e88-09950ad4dfde}",
+                    "maxVersion": "99.*",
+                    "minVersion": "0.1"
+                }
+            ],
+            "targetPlatforms": [],
+            "type": "extension",
+            "updateDate": 1407525887000,
+            "updateKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6MR8W/galdxnpGqBsYbqOzQb2eyW15YFjDDEMI0ZOzt8f504obNs920lDnpPD2/KqgsfjOgw2K7xWDJIj/18xUvWPk3LDkrnokNiRkA3KOx3W6fHycKL+zID7zy+xZYBuh2fLyQtWV1VGQ45iNRp9+Zo7rH86cdfgkdnWTlNSHyTLW9NbXvyv/E12bppPcEvgCTAQXgnDVJ0/sqmeiijn9tTFh03aM+R2V/21h8aTraAS24qiPCz6gkmYGC8yr6mglcnNoYbsLNYZ69zF1XHcXPduCPdPdfLlzVlKK1/U7hkA28eG3BIAMh6uJYBRJTpiGgaGdPd7YekUB8S6cy+CQIDAQAB",
+            "updateURL": "https://www.eff.org/files/https-everywhere-devel-update-2048.rdf",
+            "userDisabled": false,
+            "version": "5.0development.0",
+            "visible": true
+        }],
+    "schemaVersion": 16
+}
diff --git a/https-everywhere-tests/test_profile_skeleton/extensions/placeholder b/https-everywhere-tests/test_profile_skeleton/extensions/placeholder
diff --git a/https-everywhere-tests/test_profile_skeleton/prefs.js b/https-everywhere-tests/test_profile_skeleton/prefs.js
@@ -0,0 +1,4 @@
+user_pref("extensions.https_everywhere._observatory.enabled", true);
+user_pref("extensions.https_everywhere._observatory.popup_shown", true);
+user_pref("extensions.https_everywhere.toolbar_hint_shown", true);
+user_pref("extensions.https_everywhere.LogLevel", 0);
diff --git a/makexpi.sh b/makexpi.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash -e
 APP_NAME=https-everywhere
 
 # builds a .xpi from the git repository, placing the .xpi in the root
diff --git a/src/chrome/content/rules/Joyent.xml b/src/chrome/content/rules/Joyent.xml
@@ -27,7 +27,7 @@
 	<target host="www.no.de"/>
 
 	<securecookie host="^(.*\.)?(joyent\.com|no\.de)$" name=".*"/>
-    <exclusion pattern="^http://pkgsrc(?:[\w\-]*)?\.joyent\.com/"/>
+    <exclusion pattern="^http://pkgsrc[\w\-]*\.joyent\.com/"/>
 
 	<rule from="^http://joyent\.com/"
 		to="https://www.joyent.com/"/>
diff --git a/test.sh b/test.sh
@@ -1,15 +1,25 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -ex
 cd "`dirname $0`"
 
 # dummy Jetpack addon that contains tests
 TEST_ADDON_PATH=./https-everywhere-tests/
 LATEST_SDK_VERSION=1.16
 
-# firefox profile that has HTTPS Everywhere installed
-PROFILE_DIRECTORY=./test_profile
-HTTPSE_INSTALL_DIRECTORY=./test_profile/extensions/https-everywhere@eff.org
+# We'll create a Firefox profile here and install HTTPS Everywhere into it.
+PROFILE_DIRECTORY="$(mktemp -d)"
+trap 'rm -r "$PROFILE_DIRECTORY"' EXIT
+HTTPSE_INSTALL_DIRECTORY=$PROFILE_DIRECTORY/extensions/https-everywhere@eff.org
+
+# Build the XPI to run all the validations in makexpi.sh, and to ensure that
+# we test what is actually getting built.
+./makexpi.sh
+XPI_NAME="pkg/`ls -tr pkg/ | tail -1`"
+
+# Set up a skeleton profile and then install into it.
+# The skeleton contains a few files required to trick Firefox into thinking
+# that the extension was fully installed rather than just unpacked.
+rsync -a https-everywhere-tests/test_profile_skeleton/ $PROFILE_DIRECTORY
+unzip -qd $HTTPSE_INSTALL_DIRECTORY $XPI_NAME
 
 if [ ! -d "$TEST_ADDON_PATH" ]; then
   echo "Test addon path does not exist"
@@ -28,6 +38,8 @@ fi
 
 if ! type cfx > /dev/null; then
   echo "Please activate the Firefox Addon SDK before running this script."
+  echo "https://ftp.mozilla.org/pub/mozilla.org/labs/jetpack/addon-sdk-1.16.tar.gz"
+  echo "Unpack and run 'source addon-adk-1.16/bin/activate'"
   exit 1
 fi
 
@@ -36,9 +48,6 @@ if ! cfx --version | grep -q "$LATEST_SDK_VERSION"; then
     exit 1
 fi
 
-cd src/
-rsync -av --exclude-from="../.build_exclusions" . ../$HTTPSE_INSTALL_DIRECTORY
-
-cd ../$TEST_ADDON_PATH
+cd $TEST_ADDON_PATH
 echo "running tests"
-cfx test --profiledir="../$PROFILE_DIRECTORY" --verbose
+cfx test --profiledir="$PROFILE_DIRECTORY" --verbose

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/sh`
	`1`	`+#!/bin/bash -e`
`2`	`2`	`APP_NAME=https-everywhere`
`3`	`3`
`4`	`4`	`# builds a .xpi from the git repository, placing the .xpi in the root`