From 5f8de423f190bbb79a62f804151bc24824fa32d8 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <mattatobin@localhost.localdomain>
Date: Fri, 2 Feb 2018 04:16:08 -0500
Subject: Add m-esr52 at 52.6.0

---
 .../source/python-lib/cuddlefish/tests/__init__.py |  52 ++++
 .../packages/explicit-icon/explicit-icon.png       |   0
 .../packages/explicit-icon/explicit-icon64.png     |   0
 .../packages/explicit-icon/lib/main.js             |   4 +
 .../packages/explicit-icon/package.json            |   5 +
 .../packages/implicit-icon/icon.png                |   0
 .../packages/implicit-icon/icon64.png              |   0
 .../packages/implicit-icon/lib/main.js             |   4 +
 .../packages/implicit-icon/package.json            |   3 +
 .../bug-588119-files/packages/no-icon/lib/main.js  |   4 +
 .../bug-588119-files/packages/no-icon/package.json |   3 +
 .../packages/bar/lib/bar-loader.js                 |   4 +
 .../bug-588661-files/packages/bar/package.json     |   3 +
 .../packages/foo/lib/foo-loader.js                 |   4 +
 .../bug-588661-files/packages/foo/package.json     |   4 +
 .../tests/bug-611495-files/jspath-one/docs/main.md |   5 +
 .../tests/bug-611495-files/jspath-one/lib/main.js  |   8 +
 .../tests/bug-611495-files/jspath-one/package.json |   5 +
 .../packages/commonjs-naming/doc/foo.md            |   5 +
 .../packages/commonjs-naming/lib/foo-loader.js     |   5 +
 .../packages/commonjs-naming/package.json          |   3 +
 .../packages/commonjs-naming/test/test-foo.js      |   7 +
 .../packages/original-naming/docs/foo.md           |   5 +
 .../packages/original-naming/lib/foo-loader.js     |   5 +
 .../packages/original-naming/package.json          |   3 +
 .../packages/original-naming/tests/test-foo.js     |   7 +
 .../packages/default-lib/doc/foo.md                |   5 +
 .../packages/default-lib/lib/foo.js                |   5 +
 .../packages/default-lib/lib/loader.js             |   5 +
 .../packages/default-lib/package.json              |   3 +
 .../packages/default-lib/test/test-foo.js          |   7 +
 .../packages/default-locale/locale/emptyFolder     |   0
 .../packages/default-locale/package.json           |   1 +
 .../packages/default-root/doc/foo.md               |   5 +
 .../bug-652227-files/packages/default-root/foo.js  |   5 +
 .../packages/default-root/loader.js                |   5 +
 .../packages/default-root/package.json             |   3 +
 .../packages/default-root/test/test-foo.js         |   7 +
 .../packages/explicit-dir-lib/alt-lib/foo.js       |   5 +
 .../packages/explicit-dir-lib/alt-lib/loader.js    |   5 +
 .../packages/explicit-dir-lib/doc/foo.md           |   5 +
 .../packages/explicit-dir-lib/package.json         |   4 +
 .../packages/explicit-dir-lib/test/test-foo.js     |   7 +
 .../packages/explicit-lib/alt2-lib/foo.js          |   5 +
 .../packages/explicit-lib/alt2-lib/loader.js       |   5 +
 .../packages/explicit-lib/doc/foo.md               |   5 +
 .../packages/explicit-lib/package.json             |   4 +
 .../packages/explicit-lib/test/test-foo.js         |   7 +
 .../packages/extra-options/docs/main.md            |   5 +
 .../packages/extra-options/lib/main.js             |   8 +
 .../packages/extra-options/package.json            |   6 +
 .../tests/bug-715340-files/pkg-1-pack/package.json |  10 +
 .../bug-715340-files/pkg-2-unpack/package.json     |  10 +
 .../tests/bug-715340-files/pkg-3-pack/package.json |   9 +
 .../tests/bug-906359-files/fullName/package.json   |   9 +
 .../tests/bug-906359-files/none/package.json       |   9 +
 .../tests/bug-906359-files/title/package.json      |   9 +
 .../packages/foo/lib/bar-e10s-adapter.js           |  11 +
 .../e10s-adapter-files/packages/foo/lib/bar.js     |   5 +
 .../e10s-adapter-files/packages/foo/lib/foo.js     |   5 +
 .../e10s-adapter-files/packages/foo/package.json   |   1 +
 .../cuddlefish/tests/linker-files/five/lib/main.js |   5 +
 .../tests/linker-files/five/package.json           |   3 +
 .../linker-files/four-deps/four-a/lib/misc.js      |   5 +
 .../linker-files/four-deps/four-a/package.json     |   4 +
 .../linker-files/four-deps/four-a/topfiles/main.js |   5 +
 .../cuddlefish/tests/linker-files/four/lib/main.js |   5 +
 .../tests/linker-files/four/package.json           |   3 +
 .../cuddlefish/tests/linker-files/one/lib/main.js  |   9 +
 .../tests/linker-files/one/lib/subdir/three.js     |   6 +
 .../cuddlefish/tests/linker-files/one/lib/two.js   |   8 +
 .../cuddlefish/tests/linker-files/one/package.json |   4 +
 .../tests/linker-files/seven/data/text.data        |   1 +
 .../tests/linker-files/seven/lib/main.js           |   6 +
 .../tests/linker-files/seven/lib/unused.js         |   5 +
 .../tests/linker-files/seven/package.json          |   4 +
 .../tests/linker-files/six/lib/unused.js           |   5 +
 .../cuddlefish/tests/linker-files/six/package.json |   3 +
 .../tests/linker-files/six/unreachable.js          |   5 +
 .../linker-files/three-deps/three-a/lib/main.js    |   8 +
 .../three-deps/three-a/lib/subdir/subfile.js       |   5 +
 .../linker-files/three-deps/three-a/lib/unused.js  |   5 +
 .../three-deps/three-a/locale/fr-FR.properties     |   5 +
 .../linker-files/three-deps/three-a/package.json   |   3 +
 .../linker-files/three-deps/three-b/lib/main.js    |   5 +
 .../three-deps/three-b/locale/fr-FR.properties     |   6 +
 .../linker-files/three-deps/three-b/package.json   |   3 +
 .../linker-files/three-deps/three-c/lib/main.js    |   5 +
 .../linker-files/three-deps/three-c/lib/sub/foo.js |   6 +
 .../three-deps/three-c/locale/fr-FR.properties     |   9 +
 .../linker-files/three-deps/three-c/package.json   |   3 +
 .../tests/linker-files/three/data/msg.txt          |   1 +
 .../linker-files/three/data/subdir/submsg.txt      |   1 +
 .../tests/linker-files/three/lib/main.js           |   8 +
 .../tests/linker-files/three/package.json          |   3 +
 .../tests/linker-files/three/tests/nontest.js      |   5 +
 .../tests/linker-files/three/tests/test-one.js     |   5 +
 .../tests/linker-files/three/tests/test-two.js     |   5 +
 .../static-files/packages/aardvark/doc/main.md     |   0
 .../static-files/packages/aardvark/lib/ignore_me   |   3 +
 .../static-files/packages/aardvark/lib/main.js     |   8 +
 .../aardvark/lib/surprise.js/ignore_me_too         |   2 +
 .../static-files/packages/aardvark/package.json    |   7 +
 .../packages/anteater_files/lib/main.js            |   8 +
 .../packages/anteater_files/package.json           |   8 +
 .../static-files/packages/api-utils/lib/loader.js  |   7 +
 .../static-files/packages/api-utils/package.json   |   5 +
 .../packages/barbeque/lib/bar-module.js            |   7 +
 .../static-files/packages/barbeque/package.json    |   4 +
 .../static-files/packages/minimal/lib/main.js      |   8 +
 .../static-files/packages/minimal/package.json     |   4 +
 .../packages/third_party/docs/third_party.md       |   1 +
 .../packages/third_party/lib/third-party.js        |   8 +
 .../static-files/packages/third_party/package.json |   7 +
 .../xpi-template/components/harness.js             |   8 +
 .../python-lib/cuddlefish/tests/test_init.py       | 211 ++++++++++++++
 .../python-lib/cuddlefish/tests/test_licenses.py   | 100 +++++++
 .../python-lib/cuddlefish/tests/test_linker.py     | 247 ++++++++++++++++
 .../python-lib/cuddlefish/tests/test_manifest.py   | 257 +++++++++++++++++
 .../python-lib/cuddlefish/tests/test_packaging.py  | 117 ++++++++
 .../python-lib/cuddlefish/tests/test_preflight.py  | 147 ++++++++++
 .../cuddlefish/tests/test_property_parser.py       |  93 +++++++
 .../source/python-lib/cuddlefish/tests/test_rdf.py |  54 ++++
 .../python-lib/cuddlefish/tests/test_runner.py     |  27 ++
 .../python-lib/cuddlefish/tests/test_util.py       |  22 ++
 .../python-lib/cuddlefish/tests/test_version.py    |  28 ++
 .../source/python-lib/cuddlefish/tests/test_xpi.py | 310 +++++++++++++++++++++
 127 files changed, 2233 insertions(+)
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/__init__.py
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/explicit-icon.png
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/explicit-icon64.png
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/icon.png
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/icon64.png
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/no-icon/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/no-icon/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/bar/lib/bar-loader.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/bar/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/foo/lib/foo-loader.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/foo/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-611495-files/jspath-one/docs/main.md
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-611495-files/jspath-one/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-611495-files/jspath-one/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/doc/foo.md
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/lib/foo-loader.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/test/test-foo.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/docs/foo.md
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/lib/foo-loader.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/tests/test-foo.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/doc/foo.md
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/lib/foo.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/lib/loader.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/test/test-foo.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-locale/locale/emptyFolder
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-locale/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/doc/foo.md
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/foo.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/loader.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/test/test-foo.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/alt-lib/foo.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/alt-lib/loader.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/doc/foo.md
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/test/test-foo.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/alt2-lib/foo.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/alt2-lib/loader.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/doc/foo.md
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/test/test-foo.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-669274-files/packages/extra-options/docs/main.md
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-669274-files/packages/extra-options/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-669274-files/packages/extra-options/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-715340-files/pkg-1-pack/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-715340-files/pkg-2-unpack/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-715340-files/pkg-3-pack/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-906359-files/fullName/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-906359-files/none/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/bug-906359-files/title/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/lib/bar-e10s-adapter.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/lib/bar.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/lib/foo.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/five/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/five/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four-deps/four-a/lib/misc.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four-deps/four-a/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four-deps/four-a/topfiles/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/lib/subdir/three.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/lib/two.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/data/text.data
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/lib/unused.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/six/lib/unused.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/six/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/six/unreachable.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/lib/subdir/subfile.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/lib/unused.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/locale/fr-FR.properties
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-b/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-b/locale/fr-FR.properties
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-b/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/lib/sub/foo.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/locale/fr-FR.properties
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/data/msg.txt
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/data/subdir/submsg.txt
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/tests/nontest.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/tests/test-one.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/tests/test-two.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/doc/main.md
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/lib/ignore_me
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/lib/surprise.js/ignore_me_too
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/anteater_files/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/anteater_files/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/api-utils/lib/loader.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/api-utils/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/barbeque/lib/bar-module.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/barbeque/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/minimal/lib/main.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/minimal/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/third_party/docs/third_party.md
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/third_party/lib/third-party.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/third_party/package.json
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/static-files/xpi-template/components/harness.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/test_init.py
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/test_licenses.py
 create mode 100755 addon-sdk/source/python-lib/cuddlefish/tests/test_linker.py
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/test_manifest.py
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/test_packaging.py
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/test_preflight.py
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/test_property_parser.py
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/test_rdf.py
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/test_runner.py
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/test_util.py
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/test_version.py
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/test_xpi.py

(limited to 'addon-sdk/source/python-lib/cuddlefish/tests')

diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/__init__.py b/addon-sdk/source/python-lib/cuddlefish/tests/__init__.py
new file mode 100644
index 000000000..60e7e88b3
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/__init__.py
@@ -0,0 +1,52 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import unittest
+import doctest
+import glob
+
+env_root = os.environ['CUDDLEFISH_ROOT']
+
+def get_tests():
+    import cuddlefish
+    import cuddlefish.tests
+
+    tests = []
+    packages = [cuddlefish, cuddlefish.tests]
+    for package in packages:
+        path = os.path.abspath(package.__path__[0])
+        pynames = glob.glob(os.path.join(path, '*.py'))
+        for filename in pynames:
+            basename = os.path.basename(filename)
+            module_name = os.path.splitext(basename)[0]
+            full_name = "%s.%s" % (package.__name__, module_name)
+            module = __import__(full_name, fromlist=[package.__name__])
+
+            loader = unittest.TestLoader()
+            suite = loader.loadTestsFromModule(module)
+            for test in suite:
+                tests.append(test)
+
+            finder = doctest.DocTestFinder()
+            doctests = finder.find(module)
+            for test in doctests:
+                if len(test.examples) > 0:
+                    tests.append(doctest.DocTestCase(test))
+
+    return tests
+
+def run(verbose=False):
+    if verbose:
+        verbosity = 2
+    else:
+        verbosity = 1
+
+    tests = get_tests()
+    suite = unittest.TestSuite(tests)
+    runner = unittest.TextTestRunner(verbosity=verbosity)
+    return runner.run(suite)
+
+if __name__ == '__main__':
+    run()
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/explicit-icon.png b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/explicit-icon.png
new file mode 100644
index 000000000..e69de29bb
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/explicit-icon64.png b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/explicit-icon64.png
new file mode 100644
index 000000000..e69de29bb
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/lib/main.js
new file mode 100644
index 000000000..b7e0a1d5e
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/lib/main.js
@@ -0,0 +1,4 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/package.json
new file mode 100644
index 000000000..8d56d74ba
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/explicit-icon/package.json
@@ -0,0 +1,5 @@
+{
+  "loader": "lib/main.js",
+  "icon": "explicit-icon.png",
+  "icon64": "explicit-icon64.png"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/icon.png b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/icon.png
new file mode 100644
index 000000000..e69de29bb
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/icon64.png b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/icon64.png
new file mode 100644
index 000000000..e69de29bb
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/lib/main.js
new file mode 100644
index 000000000..b7e0a1d5e
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/lib/main.js
@@ -0,0 +1,4 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/package.json
new file mode 100644
index 000000000..3f0e2419f
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/implicit-icon/package.json
@@ -0,0 +1,3 @@
+{
+  "loader": "lib/main.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/no-icon/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/no-icon/lib/main.js
new file mode 100644
index 000000000..b7e0a1d5e
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/no-icon/lib/main.js
@@ -0,0 +1,4 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/no-icon/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/no-icon/package.json
new file mode 100644
index 000000000..3f0e2419f
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588119-files/packages/no-icon/package.json
@@ -0,0 +1,3 @@
+{
+  "loader": "lib/main.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/bar/lib/bar-loader.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/bar/lib/bar-loader.js
new file mode 100644
index 000000000..b7e0a1d5e
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/bar/lib/bar-loader.js
@@ -0,0 +1,4 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/bar/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/bar/package.json
new file mode 100644
index 000000000..e83a9d422
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/bar/package.json
@@ -0,0 +1,3 @@
+{
+  "loader": "lib/bar-loader.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/foo/lib/foo-loader.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/foo/lib/foo-loader.js
new file mode 100644
index 000000000..b7e0a1d5e
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/foo/lib/foo-loader.js
@@ -0,0 +1,4 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/foo/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/foo/package.json
new file mode 100644
index 000000000..4648df67e
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-588661-files/packages/foo/package.json
@@ -0,0 +1,4 @@
+{
+  "loader": "lib/foo-loader.js",
+  "dependencies": ["bar"]
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-611495-files/jspath-one/docs/main.md b/addon-sdk/source/python-lib/cuddlefish/tests/bug-611495-files/jspath-one/docs/main.md
new file mode 100644
index 000000000..54518d38d
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-611495-files/jspath-one/docs/main.md
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+minimal docs
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-611495-files/jspath-one/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-611495-files/jspath-one/lib/main.js
new file mode 100644
index 000000000..aeda0e7fb
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-611495-files/jspath-one/lib/main.js
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = function(options, callbacks) {
+  console.log("minimal");
+  callbacks.quit();
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-611495-files/jspath-one/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-611495-files/jspath-one/package.json
new file mode 100644
index 000000000..45d409a74
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-611495-files/jspath-one/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "jspath-one",
+  "author": "Jon Smith",
+  "description": "A package w/ a main module; can be built into an extension."
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/doc/foo.md b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/doc/foo.md
new file mode 100644
index 000000000..c92ddb880
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/doc/foo.md
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+I am documentation for foo.
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/lib/foo-loader.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/lib/foo-loader.js
new file mode 100644
index 000000000..2daeb3512
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/lib/foo-loader.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/package.json
new file mode 100644
index 000000000..ccc61b29d
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/package.json
@@ -0,0 +1,3 @@
+{
+  "loader": "lib/foo-loader.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/test/test-foo.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/test/test-foo.js
new file mode 100644
index 000000000..bd0cfa96f
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/commonjs-naming/test/test-foo.js
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.testThing = function(test) {
+  test.assertEqual(2, 1 + 1);
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/docs/foo.md b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/docs/foo.md
new file mode 100644
index 000000000..c92ddb880
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/docs/foo.md
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+I am documentation for foo.
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/lib/foo-loader.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/lib/foo-loader.js
new file mode 100644
index 000000000..2daeb3512
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/lib/foo-loader.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/package.json
new file mode 100644
index 000000000..ccc61b29d
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/package.json
@@ -0,0 +1,3 @@
+{
+  "loader": "lib/foo-loader.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/tests/test-foo.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/tests/test-foo.js
new file mode 100644
index 000000000..bd0cfa96f
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-614712-files/packages/original-naming/tests/test-foo.js
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.testThing = function(test) {
+  test.assertEqual(2, 1 + 1);
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/doc/foo.md b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/doc/foo.md
new file mode 100644
index 000000000..c92ddb880
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/doc/foo.md
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+I am documentation for foo.
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/lib/foo.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/lib/foo.js
new file mode 100644
index 000000000..2daeb3512
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/lib/foo.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/lib/loader.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/lib/loader.js
new file mode 100644
index 000000000..2daeb3512
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/lib/loader.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/package.json
new file mode 100644
index 000000000..c2d22aa6f
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/package.json
@@ -0,0 +1,3 @@
+{
+  "loader": "lib/loader.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/test/test-foo.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/test/test-foo.js
new file mode 100644
index 000000000..bd0cfa96f
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-lib/test/test-foo.js
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.testThing = function(test) {
+  test.assertEqual(2, 1 + 1);
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-locale/locale/emptyFolder b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-locale/locale/emptyFolder
new file mode 100644
index 000000000..e69de29bb
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-locale/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-locale/package.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-locale/package.json
@@ -0,0 +1 @@
+{}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/doc/foo.md b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/doc/foo.md
new file mode 100644
index 000000000..c92ddb880
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/doc/foo.md
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+I am documentation for foo.
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/foo.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/foo.js
new file mode 100644
index 000000000..2daeb3512
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/foo.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/loader.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/loader.js
new file mode 100644
index 000000000..2daeb3512
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/loader.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/package.json
new file mode 100644
index 000000000..100249fed
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/package.json
@@ -0,0 +1,3 @@
+{
+  "loader": "loader.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/test/test-foo.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/test/test-foo.js
new file mode 100644
index 000000000..bd0cfa96f
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/default-root/test/test-foo.js
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.testThing = function(test) {
+  test.assertEqual(2, 1 + 1);
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/alt-lib/foo.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/alt-lib/foo.js
new file mode 100644
index 000000000..2daeb3512
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/alt-lib/foo.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/alt-lib/loader.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/alt-lib/loader.js
new file mode 100644
index 000000000..2daeb3512
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/alt-lib/loader.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/doc/foo.md b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/doc/foo.md
new file mode 100644
index 000000000..c92ddb880
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/doc/foo.md
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+I am documentation for foo.
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/package.json
new file mode 100644
index 000000000..f79250e6e
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/package.json
@@ -0,0 +1,4 @@
+{
+  "directories": { "lib": "./alt-lib" },
+  "loader": "alt-lib/loader.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/test/test-foo.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/test/test-foo.js
new file mode 100644
index 000000000..bd0cfa96f
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-dir-lib/test/test-foo.js
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.testThing = function(test) {
+  test.assertEqual(2, 1 + 1);
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/alt2-lib/foo.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/alt2-lib/foo.js
new file mode 100644
index 000000000..2daeb3512
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/alt2-lib/foo.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/alt2-lib/loader.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/alt2-lib/loader.js
new file mode 100644
index 000000000..2daeb3512
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/alt2-lib/loader.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/doc/foo.md b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/doc/foo.md
new file mode 100644
index 000000000..c92ddb880
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/doc/foo.md
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+I am documentation for foo.
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/package.json
new file mode 100644
index 000000000..b017baa86
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/package.json
@@ -0,0 +1,4 @@
+{
+  "lib": "./alt2-lib",
+  "loader": "alt2-lib/loader.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/test/test-foo.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/test/test-foo.js
new file mode 100644
index 000000000..bd0cfa96f
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-652227-files/packages/explicit-lib/test/test-foo.js
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.testThing = function(test) {
+  test.assertEqual(2, 1 + 1);
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-669274-files/packages/extra-options/docs/main.md b/addon-sdk/source/python-lib/cuddlefish/tests/bug-669274-files/packages/extra-options/docs/main.md
new file mode 100644
index 000000000..54518d38d
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-669274-files/packages/extra-options/docs/main.md
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+minimal docs
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-669274-files/packages/extra-options/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/bug-669274-files/packages/extra-options/lib/main.js
new file mode 100644
index 000000000..aeda0e7fb
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-669274-files/packages/extra-options/lib/main.js
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = function(options, callbacks) {
+  console.log("minimal");
+  callbacks.quit();
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-669274-files/packages/extra-options/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-669274-files/packages/extra-options/package.json
new file mode 100644
index 000000000..de868f776
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-669274-files/packages/extra-options/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "extra-options",
+  "author": "Jon Smith",
+  "description": "A package w/ a main module; can be built into an extension.",
+  "loader": "lib/main.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-715340-files/pkg-1-pack/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-715340-files/pkg-1-pack/package.json
new file mode 100644
index 000000000..afa13e9e5
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-715340-files/pkg-1-pack/package.json
@@ -0,0 +1,10 @@
+{
+    "name": "empty",
+    "license": "MPL-2.0",
+    "author": "",
+    "version": "0.1",
+    "title": "empty",
+    "id": "jid1-80fr8b6qeRlQSQ",
+    "unpack": false,
+    "description": "test unpack= support"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-715340-files/pkg-2-unpack/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-715340-files/pkg-2-unpack/package.json
new file mode 100644
index 000000000..b1f76edcd
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-715340-files/pkg-2-unpack/package.json
@@ -0,0 +1,10 @@
+{
+    "name": "empty",
+    "license": "MPL-2.0",
+    "author": "",
+    "version": "0.1",
+    "title": "empty",
+    "id": "jid1-80fr8b6qeRlQSQ",
+    "unpack": true,
+    "description": "test unpack= support"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-715340-files/pkg-3-pack/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-715340-files/pkg-3-pack/package.json
new file mode 100644
index 000000000..e3dd9fb72
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-715340-files/pkg-3-pack/package.json
@@ -0,0 +1,9 @@
+{
+    "name": "empty",
+    "license": "MPL-2.0",
+    "author": "",
+    "version": "0.1",
+    "title": "empty",
+    "id": "jid1-80fr8b6qeRlQSQ",
+    "description": "test unpack= support"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-906359-files/fullName/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-906359-files/fullName/package.json
new file mode 100644
index 000000000..2525a1497
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-906359-files/fullName/package.json
@@ -0,0 +1,9 @@
+{
+    "name": "empty",
+    "license": "MPL-2.0",
+    "author": "",
+    "version": "0.1",
+    "fullName": "a long fullName",
+    "id": "jid1-80123",
+    "description": "test addon name fallback to 'fullName' key"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-906359-files/none/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-906359-files/none/package.json
new file mode 100644
index 000000000..b05025c72
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-906359-files/none/package.json
@@ -0,0 +1,9 @@
+{
+    "name": "a long none",
+    "license": "MPL-2.0",
+    "author": "",
+    "version": "0.1",
+
+    "id": "jid1-80123",
+    "description": "test addon name falls back all the way to the 'name' key"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/bug-906359-files/title/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/bug-906359-files/title/package.json
new file mode 100644
index 000000000..634817b7a
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/bug-906359-files/title/package.json
@@ -0,0 +1,9 @@
+{
+    "name": "empty",
+    "license": "MPL-2.0",
+    "author": "",
+    "version": "0.1",
+    "title": "a long title",
+    "id": "jid1-80123",
+    "description": "test addon name comes from the 'title' key"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/lib/bar-e10s-adapter.js b/addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/lib/bar-e10s-adapter.js
new file mode 100644
index 000000000..ad54ae76d
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/lib/bar-e10s-adapter.js
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+if (this.sendMessage) {
+} else {
+  require('bar');
+
+  exports.register = function(process) {
+  };
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/lib/bar.js b/addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/lib/bar.js
new file mode 100644
index 000000000..fe9e4fb72
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/lib/bar.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+require('chrome');
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/lib/foo.js b/addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/lib/foo.js
new file mode 100644
index 000000000..55633d167
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/lib/foo.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+require('bar');
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/package.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/e10s-adapter-files/packages/foo/package.json
@@ -0,0 +1 @@
+{}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/five/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/five/lib/main.js
new file mode 100644
index 000000000..e32a30f9c
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/five/lib/main.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = "'main' mainly reigns in main(.js)";
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/five/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/five/package.json
new file mode 100644
index 000000000..98e4b85aa
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/five/package.json
@@ -0,0 +1,3 @@
+{ "name": "five",
+  "main": "./lib/main"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four-deps/four-a/lib/misc.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four-deps/four-a/lib/misc.js
new file mode 100644
index 000000000..7e1ce7ea0
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four-deps/four-a/lib/misc.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = 42;
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four-deps/four-a/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four-deps/four-a/package.json
new file mode 100644
index 000000000..3010fae71
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four-deps/four-a/package.json
@@ -0,0 +1,4 @@
+{ "name": "four-a",
+  "directories": {"lib": "lib"},
+  "main": "./topfiles/main.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four-deps/four-a/topfiles/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four-deps/four-a/topfiles/main.js
new file mode 100644
index 000000000..7e1ce7ea0
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four-deps/four-a/topfiles/main.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = 42;
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four/lib/main.js
new file mode 100644
index 000000000..b95f7bd53
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four/lib/main.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var a = require("four-a");
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four/package.json
new file mode 100644
index 000000000..53180b9f6
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/four/package.json
@@ -0,0 +1,3 @@
+{ "name": "four",
+  "main": "main"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/lib/main.js
new file mode 100644
index 000000000..08b9245c5
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/lib/main.js
@@ -0,0 +1,9 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var panel = require("sdk/panel");
+var two = require("two.js");
+var a = require("./two");
+var b = require("sdk/tabs.js");
+var c = require("./subdir/three");
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/lib/subdir/three.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/lib/subdir/three.js
new file mode 100644
index 000000000..b594f3c68
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/lib/subdir/three.js
@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.foo = 1;
+var main = require("../main");
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/lib/two.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/lib/two.js
new file mode 100644
index 000000000..976521958
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/lib/two.js
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+// this ought to find our sibling, not packages/development-mode/lib/main.js
+var main = require("main");
+exports.foo = 1;
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/package.json
new file mode 100644
index 000000000..edd2b17c8
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/one/package.json
@@ -0,0 +1,4 @@
+{ "name": "one",
+  "id": "jid1@jetpack",
+  "main": "main"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/data/text.data b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/data/text.data
new file mode 100644
index 000000000..1269488f7
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/data/text.data
@@ -0,0 +1 @@
+data
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/lib/main.js
new file mode 100644
index 000000000..b1d68d3a0
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/lib/main.js
@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var self = require("sdk/self"); // trigger inclusion of data
+exports.main = function () { console.log("main"); };
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/lib/unused.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/lib/unused.js
new file mode 100644
index 000000000..a7b1c1449
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/lib/unused.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.unused = "just pretend I'm not here";
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/package.json
new file mode 100644
index 000000000..922c77dfc
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/seven/package.json
@@ -0,0 +1,4 @@
+{
+    "name": "seven", 
+    "id": "jid7"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/six/lib/unused.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/six/lib/unused.js
new file mode 100644
index 000000000..ada31ef8c
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/six/lib/unused.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.unused = "I am.";
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/six/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/six/package.json
new file mode 100644
index 000000000..906b24927
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/six/package.json
@@ -0,0 +1,3 @@
+{ "name": "six",
+  "main": "./unreachable"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/six/unreachable.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/six/unreachable.js
new file mode 100644
index 000000000..e8b229cde
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/six/unreachable.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = "I am outside lib/ and cannot be reached, yet";
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/lib/main.js
new file mode 100644
index 000000000..54e4b7efb
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/lib/main.js
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = 42;
+require("./subdir/subfile");
+require("sdk/self"); // trigger inclusion of our data/ directory
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/lib/subdir/subfile.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/lib/subdir/subfile.js
new file mode 100644
index 000000000..aec24d01b
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/lib/subdir/subfile.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = "I should be included in a subdir";
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/lib/unused.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/lib/unused.js
new file mode 100644
index 000000000..36c4a4e2b
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/lib/unused.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = "unused, linker should not include me in the XPI";
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/locale/fr-FR.properties b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/locale/fr-FR.properties
new file mode 100644
index 000000000..980ac46c6
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/locale/fr-FR.properties
@@ -0,0 +1,5 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+Yes= Oui
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/package.json
new file mode 100644
index 000000000..6b796fc33
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-a/package.json
@@ -0,0 +1,3 @@
+{ "name": "three-a",
+  "main": "./lib/main.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-b/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-b/lib/main.js
new file mode 100644
index 000000000..7e1ce7ea0
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-b/lib/main.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = 42;
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-b/locale/fr-FR.properties b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-b/locale/fr-FR.properties
new file mode 100644
index 000000000..c1bf1465f
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-b/locale/fr-FR.properties
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+No= Non
+one= un
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-b/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-b/package.json
new file mode 100644
index 000000000..c0ff5ee0e
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-b/package.json
@@ -0,0 +1,3 @@
+{ "name": "three-b",
+  "main": "./lib/main"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/lib/main.js
new file mode 100644
index 000000000..7e1ce7ea0
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/lib/main.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = 42;
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/lib/sub/foo.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/lib/sub/foo.js
new file mode 100644
index 000000000..587849615
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/lib/sub/foo.js
@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.foo = "you found me down here";
+
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/locale/fr-FR.properties b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/locale/fr-FR.properties
new file mode 100644
index 000000000..dac3f133b
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/locale/fr-FR.properties
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+No= Nein
+What?= Quoi?
+plural=other
+plural[one]=one
+uft8_value=é
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/package.json
new file mode 100644
index 000000000..169c9146b
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three-deps/three-c/package.json
@@ -0,0 +1,3 @@
+{ "name": "three-c",
+  "main": "lib/main"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/data/msg.txt b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/data/msg.txt
new file mode 100644
index 000000000..3b18e512d
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/data/msg.txt
@@ -0,0 +1 @@
+hello world
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/data/subdir/submsg.txt b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/data/subdir/submsg.txt
new file mode 100644
index 000000000..d2cfe80de
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/data/subdir/submsg.txt
@@ -0,0 +1 @@
+hello subdir
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/lib/main.js
new file mode 100644
index 000000000..4f5944374
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/lib/main.js
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var a = require("three-a");
+var b = require("three-b");
+var c = require("three-c");
+var c3 = require("three-c/sub/foo");
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/package.json
new file mode 100644
index 000000000..cbfbc5bb2
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/package.json
@@ -0,0 +1,3 @@
+{ "name": "three",
+  "main": "main"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/tests/nontest.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/tests/nontest.js
new file mode 100644
index 000000000..edbc08ef2
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/tests/nontest.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// dummy
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/tests/test-one.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/tests/test-one.js
new file mode 100644
index 000000000..edbc08ef2
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/tests/test-one.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// dummy
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/tests/test-two.js b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/tests/test-two.js
new file mode 100644
index 000000000..edbc08ef2
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/linker-files/three/tests/test-two.js
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// dummy
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/doc/main.md b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/doc/main.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/lib/ignore_me b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/lib/ignore_me
new file mode 100644
index 000000000..014242c92
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/lib/ignore_me
@@ -0,0 +1,3 @@
+The docs processor should tolerate (by ignoring) random non-.js files in lib
+directories, such as those left around by editors, version-control systems,
+or OS metadata like .DS_Store . This file exercises that tolerance.
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/lib/main.js
new file mode 100644
index 000000000..026487257
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/lib/main.js
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = function(options, callbacks) {
+  console.log("1 + 1 =", require("bar-module").add(1, 1));
+  callbacks.quit();
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/lib/surprise.js/ignore_me_too b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/lib/surprise.js/ignore_me_too
new file mode 100644
index 000000000..066f9b55d
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/lib/surprise.js/ignore_me_too
@@ -0,0 +1,2 @@
+The docs processor should also ignore directories named *.js, and their
+contents.
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/package.json
new file mode 100644
index 000000000..afb5698e9
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/aardvark/package.json
@@ -0,0 +1,7 @@
+{
+  "author": "Jon Smith",
+  "description": "A package w/ a main module; can be built into an extension.",
+  "keywords": ["potato"],
+  "version": "1.0",
+  "dependencies": ["addon-sdk", "barbeque"]
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/anteater_files/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/anteater_files/lib/main.js
new file mode 100644
index 000000000..026487257
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/anteater_files/lib/main.js
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = function(options, callbacks) {
+  console.log("1 + 1 =", require("bar-module").add(1, 1));
+  callbacks.quit();
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/anteater_files/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/anteater_files/package.json
new file mode 100644
index 000000000..9684581da
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/anteater_files/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "anteater",
+  "author": "Jon Smith",
+  "description": "A package w/ a main module; can be built into an extension.",
+  "keywords": ["potato"],
+  "version": "1.0",
+  "dependencies": ["addon-sdk", "barbeque"]
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/api-utils/lib/loader.js b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/api-utils/lib/loader.js
new file mode 100644
index 000000000..361846d27
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/api-utils/lib/loader.js
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// This module will be imported by the XPCOM harness/boostrapper
+// via Components.utils.import() and is responsible for creating a
+// CommonJS module loader.
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/api-utils/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/api-utils/package.json
new file mode 100644
index 000000000..64eb065be
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/api-utils/package.json
@@ -0,0 +1,5 @@
+{
+  "description": "A foundational package that provides a CommonJS module loader implementation.",
+  "keywords": ["potato", "jetpack-low-level"],
+  "loader": "lib/loader.js"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/barbeque/lib/bar-module.js b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/barbeque/lib/bar-module.js
new file mode 100644
index 000000000..ff982ae20
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/barbeque/lib/bar-module.js
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.add = function add(a, b) {
+  return a + b;
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/barbeque/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/barbeque/package.json
new file mode 100644
index 000000000..62e3c12d7
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/barbeque/package.json
@@ -0,0 +1,4 @@
+{
+  "keywords": ["potato", "jetpack-low-level"],
+  "description": "A package used by 'aardvark' as a library."
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/minimal/lib/main.js b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/minimal/lib/main.js
new file mode 100644
index 000000000..aeda0e7fb
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/minimal/lib/main.js
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = function(options, callbacks) {
+  console.log("minimal");
+  callbacks.quit();
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/minimal/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/minimal/package.json
new file mode 100644
index 000000000..530f3c247
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/minimal/package.json
@@ -0,0 +1,4 @@
+{
+  "author": "Jon Smith",
+  "description": "A package w/ a main module; can be built into an extension."
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/third_party/docs/third_party.md b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/third_party/docs/third_party.md
new file mode 100644
index 000000000..35152f601
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/third_party/docs/third_party.md
@@ -0,0 +1 @@
+hello, I'm a third party.
\ No newline at end of file
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/third_party/lib/third-party.js b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/third_party/lib/third-party.js
new file mode 100644
index 000000000..026487257
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/third_party/lib/third-party.js
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+exports.main = function(options, callbacks) {
+  console.log("1 + 1 =", require("bar-module").add(1, 1));
+  callbacks.quit();
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/third_party/package.json b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/third_party/package.json
new file mode 100644
index 000000000..afb5698e9
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/packages/third_party/package.json
@@ -0,0 +1,7 @@
+{
+  "author": "Jon Smith",
+  "description": "A package w/ a main module; can be built into an extension.",
+  "keywords": ["potato"],
+  "version": "1.0",
+  "dependencies": ["addon-sdk", "barbeque"]
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/static-files/xpi-template/components/harness.js b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/xpi-template/components/harness.js
new file mode 100644
index 000000000..a20bf3fe6
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/static-files/xpi-template/components/harness.js
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// This file contains XPCOM code that bootstraps an SDK-based add-on
+// by loading its harness-options.json, registering all its resource
+// directories, executing its loader, and then executing its program's
+// main() function.
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_init.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_init.py
new file mode 100644
index 000000000..5ececfea6
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_init.py
@@ -0,0 +1,211 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os, unittest, shutil
+import zipfile
+from StringIO import StringIO
+from cuddlefish import initializer
+from cuddlefish.templates import TEST_MAIN_JS, PACKAGE_JSON
+
+tests_path = os.path.abspath(os.path.dirname(__file__))
+
+class TestInit(unittest.TestCase):
+
+    def run_init_in_subdir(self, dirname, f, *args, **kwargs):
+        top = os.path.abspath(os.getcwd())
+        basedir = os.path.abspath(os.path.join(".test_tmp",self.id(),dirname))
+        if os.path.isdir(basedir):
+            assert basedir.startswith(top)
+            shutil.rmtree(basedir)
+        os.makedirs(basedir)
+        try:
+            os.chdir(basedir)
+            return f(basedir, *args, **kwargs)
+        finally:
+            os.chdir(top)
+
+    def do_test_init(self,basedir):
+        # Let's init the addon, no error admitted
+        f = open(".ignoreme","w")
+        f.write("stuff")
+        f.close()
+
+        out, err = StringIO(), StringIO()
+        init_run = initializer(None, ["init"], out, err)
+        out, err = out.getvalue(), err.getvalue()
+        self.assertEqual(init_run["result"], 0)
+        self.assertTrue("* lib directory created" in out)
+        self.assertTrue("* data directory created" in out)
+        self.assertTrue("Have fun!" in out)
+        self.assertEqual(err,"")
+        self.assertTrue(len(os.listdir(basedir))>0)
+        main_js = os.path.join(basedir,"lib","main.js")
+        package_json = os.path.join(basedir,"package.json")
+        test_main_js = os.path.join(basedir,"test","test-main.js")
+        self.assertTrue(os.path.exists(main_js))
+        self.assertTrue(os.path.exists(package_json))
+        self.assertTrue(os.path.exists(test_main_js))
+        self.assertEqual(open(main_js,"r").read(),"")
+        self.assertEqual(open(package_json,"r").read() % {"id":"tmp_addon_id" },
+                         PACKAGE_JSON % {"name":"tmp_addon_sample",
+                                         "title": "tmp_addon_SAMPLE",
+                                         "id":init_run["jid"] })
+        self.assertEqual(open(test_main_js,"r").read(),TEST_MAIN_JS)
+
+        # Let's check that the addon is initialized
+        out, err = StringIO(), StringIO()
+        init_run = initializer(None, ["init"], out, err)
+        out, err = out.getvalue(), err.getvalue()
+        self.failIfEqual(init_run["result"],0)
+        self.assertTrue("This command must be run in an empty directory." in err)
+
+    def test_initializer(self):
+        self.run_init_in_subdir("tmp_addon_SAMPLE",self.do_test_init)
+
+    def do_test_args(self, basedir):
+        # check that running it with spurious arguments will fail
+        out,err = StringIO(), StringIO()
+        init_run = initializer(None, ["init", "specified-dirname", "extra-arg"], out, err)
+        out, err = out.getvalue(), err.getvalue()
+        self.failIfEqual(init_run["result"], 0)
+        self.assertTrue("Too many arguments" in err)
+
+    def test_args(self):
+        self.run_init_in_subdir("tmp_addon_sample", self.do_test_args)
+
+    def _test_existing_files(self, basedir):
+        f = open("pay_attention_to_me","w")
+        f.write("stuff")
+        f.close()
+        out,err = StringIO(), StringIO()
+        rc = initializer(None, ["init"], out, err)
+        out, err = out.getvalue(), err.getvalue()
+        self.assertEqual(rc["result"], 1)
+        self.failUnless("This command must be run in an empty directory" in err,
+                        err)
+        self.failIf(os.path.exists("lib"))
+
+    def test_existing_files(self):
+        self.run_init_in_subdir("existing_files", self._test_existing_files)
+
+    def test_init_subdir(self):
+        parent = os.path.abspath(os.path.join(".test_tmp", self.id()))
+        basedir = os.path.join(parent, "init-basedir")
+        if os.path.exists(parent):
+            shutil.rmtree(parent)
+        os.makedirs(parent)
+
+        # if the basedir exists and is not empty, init should refuse
+        os.makedirs(basedir)
+        f = open(os.path.join(basedir, "boo"), "w")
+        f.write("stuff")
+        f.close()
+        out, err = StringIO(), StringIO()
+        rc = initializer(None, ["init", basedir], out, err)
+        out, err = out.getvalue(), err.getvalue()
+        self.assertEqual(rc["result"], 1)
+        self.assertTrue("testing if directory is empty" in out, out)
+        self.assertTrue("This command must be run in an empty directory." in err,
+                        err)
+
+        # a .dotfile should be tolerated
+        os.rename(os.path.join(basedir, "boo"), os.path.join(basedir, ".phew"))
+        out, err = StringIO(), StringIO()
+        rc = initializer(None, ["init", basedir], out, err)
+        out, err = out.getvalue(), err.getvalue()
+        self.assertEqual(rc["result"], 0)
+        self.assertTrue("* data directory created" in out, out)
+        self.assertTrue("Have fun!" in out)
+        self.assertEqual(err,"")
+        self.assertTrue(os.listdir(basedir))
+        main_js = os.path.join(basedir,"lib","main.js")
+        package_json = os.path.join(basedir,"package.json")
+        self.assertTrue(os.path.exists(main_js))
+        self.assertTrue(os.path.exists(package_json))
+        shutil.rmtree(basedir)
+
+        # init should create directories that don't exist already
+        out, err = StringIO(), StringIO()
+        rc = initializer(None, ["init", basedir], out, err)
+        out, err = out.getvalue(), err.getvalue()
+        self.assertEqual(rc["result"], 0)
+        self.assertTrue("* data directory created" in out)
+        self.assertTrue("Have fun!" in out)
+        self.assertEqual(err,"")
+        self.assertTrue(os.listdir(basedir))
+        main_js = os.path.join(basedir,"lib","main.js")
+        package_json = os.path.join(basedir,"package.json")
+        self.assertTrue(os.path.exists(main_js))
+        self.assertTrue(os.path.exists(package_json))
+
+
+class TestCfxQuits(unittest.TestCase):
+
+    def run_cfx(self, addon_path, command):
+        old_cwd = os.getcwd()
+        os.chdir(addon_path)
+        import sys
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
+        sys.stdout = out = StringIO()
+        sys.stderr = err = StringIO()
+        rc = 0
+        try:
+            import cuddlefish
+            args = list(command)
+            # Pass arguments given to cfx so that cfx can find firefox path
+            # if --binary option is given:
+            args.extend(sys.argv[1:])
+            cuddlefish.run(arguments=args)
+        except SystemExit, e:
+            if "code" in e:
+                rc = e.code
+            elif "args" in e and len(e.args)>0:
+                rc = e.args[0]
+            else:
+                rc = 0
+        finally:
+            sys.stdout = old_stdout
+            sys.stderr = old_stderr
+            os.chdir(old_cwd)
+        out.flush()
+        err.flush()
+        return rc, out.getvalue(), err.getvalue()
+
+    # this method doesn't exists in python 2.5,
+    # implements our own
+    def assertIn(self, member, container):
+        """Just like self.assertTrue(a in b), but with a nicer default message."""
+        if member not in container:
+            standardMsg = '"%s" not found in "%s"' % (member,
+                                                  container)
+            self.fail(standardMsg)
+
+    def test_cfx_init(self):
+        # Create an empty test directory
+        addon_path = os.path.abspath(os.path.join(".test_tmp", "test-cfx-init"))
+        if os.path.isdir(addon_path):
+            shutil.rmtree(addon_path)
+        os.makedirs(addon_path)
+
+        # Fake a call to cfx init
+        old_cwd = os.getcwd()
+        os.chdir(addon_path)
+        out, err = StringIO(), StringIO()
+        rc = initializer(None, ["init"], out, err)
+        os.chdir(old_cwd)
+        out, err = out.getvalue(), err.getvalue()
+        self.assertEqual(rc["result"], 0)
+        self.assertTrue("Have fun!" in out)
+        self.assertEqual(err,"")
+
+        # run cfx test
+        rc, out, err = self.run_cfx(addon_path, ["test"])
+        self.assertEqual(rc, 0)
+        self.assertIn("6 of 6 tests passed.", err)
+        self.assertIn("Program terminated successfully.", err)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_licenses.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_licenses.py
new file mode 100644
index 000000000..574812ada
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_licenses.py
@@ -0,0 +1,100 @@
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import unittest
+import os.path
+
+parent = os.path.dirname
+test_dir = parent(os.path.abspath(__file__))
+sdk_root = parent(parent(parent(test_dir)))
+
+def from_sdk_top(fn):
+    return os.path.abspath(os.path.join(sdk_root, fn))
+
+MPL2_URL = "http://mozilla.org/MPL/2.0/"
+
+# These files all come with their own license headers
+skip = [
+    "python-lib/cuddlefish/_version.py", # generated, public domain
+    "doc/static-files/js/jquery.js", # MIT/GPL dual
+    "examples/annotator/data/jquery-1.4.2.min.js", # MIT/GPL dual
+    "examples/reddit-panel/data/jquery-1.4.4.min.js", # MIT/GPL dual
+    "examples/library-detector/data/library-detector.js", # MIT
+    "python-lib/mozrunner/killableprocess.py", # MIT? BSDish?
+    "python-lib/mozrunner/winprocess.py", # MIT
+    "packages/api-utils/tests/test-querystring.js", # MIT
+    "packages/api-utils/lib/promise.js", # MIT
+    "packages/api-utils/tests/test-promise.js", # MIT
+    "examples/actor-repl/README.md", # It's damn readme file
+    "examples/actor-repl/data/codemirror-compressed.js", # MIT
+    "examples/actor-repl/data/codemirror.css", # MIT
+    ]
+absskip = [from_sdk_top(os.path.join(*fn.split("/"))) for fn in skip]
+
+class Licenses(unittest.TestCase):
+    def test(self):
+        # Examine most SDK files to check if they've got an MPL2 license
+        # header. We exclude some files that are known to include different
+        # licenses.
+        self.missing = []
+        self.scan_file(from_sdk_top(os.path.join("python-lib", "jetpack_sdk_env.py")))
+        self.scan(os.path.join("python-lib", "cuddlefish"), [".js", ".py"],
+                  skipdirs=["sdk-docs"], # test_generate.py makes this
+                  )
+        self.scan(os.path.join("python-lib", "mozrunner"), [".py"])
+        self.scan("lib", [".js", ".jsm", ".css"],
+                  skipdirs=[
+                    "diffpatcher", # MIT
+                    "method", # MIT
+                    "child_process", # MPL 1.1/GPL 2.0/LGPL 2.1
+                    "fs" # MIT
+                  ])
+        self.scan("test", [".js", ".jsm", ".css", ".html"],
+                  skipdirs=[
+                    "buffers", # MIT
+                    "querystring", # MIT
+                    "path" # MIT
+                  ])
+        self.scan("modules", [".js", ".jsm"])
+        self.scan("examples", [".js", ".css", ".html", ".md"])
+        self.scan("bin", [".bat", ".ps1", ".js"])
+        for fn in [os.path.join("bin", "activate"),
+                   os.path.join("bin", "cfx"),
+                   os.path.join("bin", "integration-scripts", "buildbot-run-cfx-helper"),
+                   os.path.join("bin", "integration-scripts", "integration-check"),
+                   ]:
+            self.scan_file(from_sdk_top(fn))
+
+        if self.missing:
+            print
+            print "The following files are missing an MPL2 header:"
+            for fn in sorted(self.missing):
+                print " "+fn
+            self.fail("%d files are missing an MPL2 header" % len(self.missing))
+
+    def scan(self, start, extensions=[], skipdirs=[]):
+        # scan a whole subdirectory
+        start = from_sdk_top(start)
+        for root, dirs, files in os.walk(start):
+            for d in skipdirs:
+                if d in dirs:
+                    dirs.remove(d)
+            for fn in files:
+                ext = os.path.splitext(fn)[1]
+                if extensions and ext not in extensions:
+                    continue
+                absfn = os.path.join(root, fn)
+                if absfn in absskip:
+                    continue
+                self.scan_file(absfn)
+
+    def scan_file(self, fn):
+        # scan a single file
+        if not MPL2_URL in open(fn, "r").read():
+            relfile = fn[len(sdk_root)+1:]
+            self.missing.append(relfile)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_linker.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_linker.py
new file mode 100755
index 000000000..7a6fd12e4
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_linker.py
@@ -0,0 +1,247 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os.path
+import shutil
+import zipfile
+from StringIO import StringIO
+import simplejson as json
+import unittest
+import cuddlefish
+from cuddlefish import packaging, manifest
+
+def up(path, generations=1):
+    for i in range(generations):
+        path = os.path.dirname(path)
+    return path
+
+ROOT = up(os.path.abspath(__file__), 4)
+def get_linker_files_dir(name):
+    return os.path.join(up(os.path.abspath(__file__)), "linker-files", name)
+
+class Basic(unittest.TestCase):
+    def get_pkg(self, name):
+        d = get_linker_files_dir(name)
+        return packaging.get_config_in_dir(d)
+
+    def test_deps(self):
+        target_cfg = self.get_pkg("one")
+        pkg_cfg = packaging.build_config(ROOT, target_cfg)
+        deps = packaging.get_deps_for_targets(pkg_cfg, ["one"])
+        self.failUnlessEqual(deps, ["one"])
+        deps = packaging.get_deps_for_targets(pkg_cfg,
+                                              [target_cfg.name, "addon-sdk"])
+        self.failUnlessEqual(deps, ["addon-sdk", "one"])
+
+    def test_manifest(self):
+        target_cfg = self.get_pkg("one")
+        pkg_cfg = packaging.build_config(ROOT, target_cfg)
+        deps = packaging.get_deps_for_targets(pkg_cfg,
+                                              [target_cfg.name, "addon-sdk"])
+        self.failUnlessEqual(deps, ["addon-sdk", "one"])
+        # target_cfg.dependencies is not provided, so we'll search through
+        # all known packages (everything in 'deps').
+        m = manifest.build_manifest(target_cfg, pkg_cfg, deps, scan_tests=False)
+        m = m.get_harness_options_manifest(False)
+
+        def assertReqIs(modname, reqname, path):
+            reqs = m["one/%s" % modname]["requirements"]
+            self.failUnlessEqual(reqs[reqname], path)
+
+        assertReqIs("main", "sdk/panel", "sdk/panel")
+        assertReqIs("main", "two.js", "one/two")
+        assertReqIs("main", "./two", "one/two")
+        assertReqIs("main", "sdk/tabs.js", "sdk/tabs")
+        assertReqIs("main", "./subdir/three", "one/subdir/three")
+        assertReqIs("two", "main", "one/main")
+        assertReqIs("subdir/three", "../main", "one/main")
+
+        target_cfg.dependencies = []
+
+        try:
+            # this should now work, as we ignore missing modules by default
+            m = manifest.build_manifest(target_cfg, pkg_cfg, deps, scan_tests=False)
+            m = m.get_harness_options_manifest(False)
+
+            assertReqIs("main", "sdk/panel", "sdk/panel")
+            # note that with "addon-sdk" dependency present,
+            # "sdk/tabs.js" mapped to "sdk/tabs", but without,
+            # we just get the default (identity) mapping
+            assertReqIs("main", "sdk/tabs.js", "sdk/tabs.js")
+        except Exception, e:
+            self.fail("Must not throw from build_manifest() if modules are missing")
+
+        # now, because .dependencies *is* provided, we won't search 'deps',
+        # and stop_on_missing is True, we'll get a link error
+        self.assertRaises(manifest.ModuleNotFoundError,
+                          manifest.build_manifest,
+                          target_cfg, pkg_cfg, deps, scan_tests=False,
+                          abort_on_missing=True)
+
+    def test_main_in_deps(self):
+        target_cfg = self.get_pkg("three")
+        package_path = [get_linker_files_dir("three-deps")]
+        pkg_cfg = packaging.build_config(ROOT, target_cfg,
+                                         packagepath=package_path)
+        deps = packaging.get_deps_for_targets(pkg_cfg,
+                                              [target_cfg.name, "addon-sdk"])
+        self.failUnlessEqual(deps, ["addon-sdk", "three"])
+        m = manifest.build_manifest(target_cfg, pkg_cfg, deps, scan_tests=False)
+        m = m.get_harness_options_manifest(False)
+        def assertReqIs(modname, reqname, path):
+            reqs = m["three/%s" % modname]["requirements"]
+            self.failUnlessEqual(reqs[reqname], path)
+        assertReqIs("main", "three-a", "three-a/main")
+        assertReqIs("main", "three-b", "three-b/main")
+        assertReqIs("main", "three-c", "three-c/main")
+
+    def test_relative_main_in_top(self):
+        target_cfg = self.get_pkg("five")
+        package_path = []
+        pkg_cfg = packaging.build_config(ROOT, target_cfg,
+                                         packagepath=package_path)
+        deps = packaging.get_deps_for_targets(pkg_cfg,
+                                              [target_cfg.name, "addon-sdk"])
+        self.failUnlessEqual(deps, ["addon-sdk", "five"])
+        # all we care about is that this next call doesn't raise an exception
+        m = manifest.build_manifest(target_cfg, pkg_cfg, deps, scan_tests=False)
+        m = m.get_harness_options_manifest(False)
+        reqs = m["five/main"]["requirements"]
+        self.failUnlessEqual(reqs, {});
+
+    def test_unreachable_relative_main_in_top(self):
+        target_cfg = self.get_pkg("six")
+        package_path = []
+        pkg_cfg = packaging.build_config(ROOT, target_cfg,
+                                         packagepath=package_path)
+        deps = packaging.get_deps_for_targets(pkg_cfg,
+                                              [target_cfg.name, "addon-sdk"])
+        self.failUnlessEqual(deps, ["addon-sdk", "six"])
+        self.assertRaises(manifest.UnreachablePrefixError,
+                          manifest.build_manifest,
+                          target_cfg, pkg_cfg, deps, scan_tests=False)
+
+    def test_unreachable_in_deps(self):
+        target_cfg = self.get_pkg("four")
+        package_path = [get_linker_files_dir("four-deps")]
+        pkg_cfg = packaging.build_config(ROOT, target_cfg,
+                                         packagepath=package_path)
+        deps = packaging.get_deps_for_targets(pkg_cfg,
+                                              [target_cfg.name, "addon-sdk"])
+        self.failUnlessEqual(deps, ["addon-sdk", "four"])
+        self.assertRaises(manifest.UnreachablePrefixError,
+                          manifest.build_manifest,
+                          target_cfg, pkg_cfg, deps, scan_tests=False)
+
+class Contents(unittest.TestCase):
+
+    def run_in_subdir(self, dirname, f, *args, **kwargs):
+        top = os.path.abspath(os.getcwd())
+        basedir = os.path.abspath(os.path.join(".test_tmp",self.id(),dirname))
+        if os.path.isdir(basedir):
+            assert basedir.startswith(top)
+            shutil.rmtree(basedir)
+        os.makedirs(basedir)
+        try:
+            os.chdir(basedir)
+            return f(basedir, *args, **kwargs)
+        finally:
+            os.chdir(top)
+
+    def assertIn(self, what, inside_what):
+        self.failUnless(what in inside_what, inside_what)
+
+    def test_jetpackID(self):
+        # this uses "id": "jid7", to which a @jetpack should be appended
+        seven = get_linker_files_dir("seven")
+        def _test(basedir):
+            stdout = StringIO()
+            shutil.copytree(seven, "seven")
+            os.chdir("seven")
+            try:
+                # regrettably, run() always finishes with sys.exit()
+                cuddlefish.run(["xpi", "--no-strip-xpi"],
+                               stdout=stdout)
+            except SystemExit, e:
+                self.failUnlessEqual(e.args[0], 0)
+            zf = zipfile.ZipFile("seven.xpi", "r")
+            hopts = json.loads(zf.read("harness-options.json"))
+            self.failUnlessEqual(hopts["jetpackID"], "jid7@jetpack")
+        self.run_in_subdir("x", _test)
+
+    def test_jetpackID_suffix(self):
+        # this uses "id": "jid1@jetpack", so no suffix should be appended
+        one = get_linker_files_dir("one")
+        def _test(basedir):
+            stdout = StringIO()
+            shutil.copytree(one, "one")
+            os.chdir("one")
+            try:
+                # regrettably, run() always finishes with sys.exit()
+                cuddlefish.run(["xpi", "--no-strip-xpi"],
+                               stdout=stdout)
+            except SystemExit, e:
+                self.failUnlessEqual(e.args[0], 0)
+            zf = zipfile.ZipFile("one.xpi", "r")
+            hopts = json.loads(zf.read("harness-options.json"))
+            self.failUnlessEqual(hopts["jetpackID"], "jid1@jetpack")
+        self.run_in_subdir("x", _test)
+
+    def test_strip_default(self):
+        seven = get_linker_files_dir("seven")
+        # now run 'cfx xpi' in that directory, except put the generated .xpi
+        # elsewhere
+        def _test(basedir):
+            stdout = StringIO()
+            shutil.copytree(seven, "seven")
+            os.chdir("seven")
+            try:
+                # regrettably, run() always finishes with sys.exit()
+                cuddlefish.run(["xpi"], # --strip-xpi is now the default
+                               stdout=stdout)
+            except SystemExit, e:
+                self.failUnlessEqual(e.args[0], 0)
+            zf = zipfile.ZipFile("seven.xpi", "r")
+            names = zf.namelist()
+            # problem found in bug 664840 was that an addon
+            # without an explicit tests/ directory would copy all files from
+            # the package into a bogus JID-PKGNAME-tests/ directory, so check
+            # for that
+            testfiles = [fn for fn in names if "seven/tests" in fn]
+            self.failUnlessEqual([], testfiles)
+            # another problem was that data files were being stripped from
+            # the XPI. Note that data/ is only supposed to be included if a
+            # module that actually gets used does a require("self") .
+            self.assertIn("resources/seven/data/text.data",
+                          names)
+            self.failIf("seven/lib/unused.js"
+                        in names, names)
+        self.run_in_subdir("x", _test)
+
+    def test_no_strip(self):
+        seven = get_linker_files_dir("seven")
+        def _test(basedir):
+            stdout = StringIO()
+            shutil.copytree(seven, "seven")
+            os.chdir("seven")
+            try:
+                # regrettably, run() always finishes with sys.exit()
+                cuddlefish.run(["xpi", "--no-strip-xpi"],
+                               stdout=stdout)
+            except SystemExit, e:
+                self.failUnlessEqual(e.args[0], 0)
+            zf = zipfile.ZipFile("seven.xpi", "r")
+            names = zf.namelist()
+            self.assertIn("resources/addon-sdk/lib/sdk/loader/cuddlefish.js", names)
+            testfiles = [fn for fn in names if "seven/tests" in fn]
+            self.failUnlessEqual([], testfiles)
+            self.assertIn("resources/seven/data/text.data",
+                          names)
+            self.failUnless("resources/seven/lib/unused.js"
+                            in names, names)
+        self.run_in_subdir("x", _test)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_manifest.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_manifest.py
new file mode 100644
index 000000000..1bced1234
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_manifest.py
@@ -0,0 +1,257 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+import unittest
+from StringIO import StringIO
+from cuddlefish.manifest import scan_module
+
+class Extra:
+    def failUnlessKeysAre(self, d, keys):
+        self.failUnlessEqual(sorted(d.keys()), sorted(keys))
+
+class Require(unittest.TestCase, Extra):
+    def scan(self, text):
+        lines = StringIO(text).readlines()
+        requires, problems, locations = scan_module("fake.js", lines)
+        self.failUnlessEqual(problems, False)
+        return requires
+
+    def scan_locations(self, text):
+        lines = StringIO(text).readlines()
+        requires, problems, locations = scan_module("fake.js", lines)
+        self.failUnlessEqual(problems, False)
+        return requires, locations
+
+    def test_modules(self):
+        mod = """var foo = require('one');"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["one"])
+
+        mod = """var foo = require(\"one\");"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["one"])
+
+        mod = """var foo=require(  'one' )  ;  """
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["one"])
+
+        mod = """var foo = require('o'+'ne'); // tricky, denied"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, [])
+
+        mod = """require('one').immediately.do().stuff();"""
+        requires, locations = self.scan_locations(mod)
+        self.failUnlessKeysAre(requires, ["one"])
+        self.failUnlessEqual(locations, {"one": 1})
+
+        # these forms are commented out, and thus ignored
+
+        mod = """// var foo = require('one');"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, [])
+
+        mod = """/* var foo = require('one');"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, [])
+
+        mod = """ * var foo = require('one');"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, [])
+
+        mod = """ ' var foo = require('one');"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["one"])
+
+        mod = """ \" var foo = require('one');"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["one"])
+
+        # multiple requires
+
+        mod = """const foo = require('one');
+        const foo = require('two');"""
+        requires, locations = self.scan_locations(mod)
+        self.failUnlessKeysAre(requires, ["one", "two"])
+        self.failUnlessEqual(locations["one"], 1)
+        self.failUnlessEqual(locations["two"], 2)
+
+        mod = """const foo = require('repeated');
+        const bar = require('repeated');
+        const baz = require('repeated');"""
+        requires, locations = self.scan_locations(mod)
+        self.failUnlessKeysAre(requires, ["repeated"])
+        self.failUnlessEqual(locations["repeated"], 1) # first occurrence
+
+        mod = """const foo = require('one'); const foo = require('two');"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["one", "two"])
+
+        # define calls
+
+        mod = """define('one', ['two', 'numbers/three'], function(t, th) {});"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["two", "numbers/three"])
+
+        mod = """define(
+        ['odd',
+        "numbers/four"], function() {});"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["odd", "numbers/four"])
+
+        mod = """define(function(require, exports, module) {
+                var a = require("some/module/a"),
+                    b = require('b/v1');
+                exports.a = a;
+                //This is a fakeout: require('bad');
+                /* And another var bad = require('bad2'); */
+                require('foo').goFoo();
+            });"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["some/module/a", "b/v1", "foo"])
+
+        mod = """define (
+            "foo",
+            ["bar"], function (bar) {
+                var me = require("me");
+            }
+        )"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["bar", "me"])
+
+        mod = """define(['se' + 'ven', 'eight', nine], function () {});"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["eight"])
+
+        # async require calls
+
+        mod = """require(['one'], function(one) {var o = require("one");});"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["one"])
+
+        mod = """require([  'one' ], function(one) {var t = require("two");});"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["one", "two"])
+
+        mod = """require ( ['two', 'numbers/three'], function(t, th) {});"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["two", "numbers/three"])
+
+        mod = """require (
+            ["bar", "fa" + 'ke'  ], function (bar) {
+                var me = require("me");
+                // require("bad").doBad();
+            }
+        )"""
+        requires = self.scan(mod)
+        self.failUnlessKeysAre(requires, ["bar", "me"])
+
+def scan2(text, fn="fake.js"):
+    stderr = StringIO()
+    lines = StringIO(text).readlines()
+    requires, problems, locations = scan_module(fn, lines, stderr)
+    stderr.seek(0)
+    return requires, problems, stderr.readlines()
+
+class Chrome(unittest.TestCase, Extra):
+
+    def test_ignore_loader(self):
+        # we specifically ignore the loader itself
+        mod = """let {Cc,Ci} = require('chrome');"""
+        requires, problems, err = scan2(mod, "blah/cuddlefish.js")
+        self.failUnlessKeysAre(requires, ["chrome"])
+        self.failUnlessEqual(problems, False)
+        self.failUnlessEqual(err, [])
+
+    def test_chrome(self):
+        mod = """let {Cc,Ci} = require('chrome');"""
+        requires, problems, err = scan2(mod)
+        self.failUnlessKeysAre(requires, ["chrome"])
+        self.failUnlessEqual(problems, False)
+        self.failUnlessEqual(err, [])
+
+        mod = """var foo = require('foo');
+        let {Cc,Ci} = require('chrome');"""
+        requires, problems, err = scan2(mod)
+        self.failUnlessKeysAre(requires, ["foo", "chrome"])
+        self.failUnlessEqual(problems, False)
+        self.failUnlessEqual(err, [])
+
+        mod = """let c = require('chrome');"""
+        requires, problems, err = scan2(mod)
+        self.failUnlessKeysAre(requires, ["chrome"])
+        self.failUnlessEqual(problems, False)
+        self.failUnlessEqual(err, [])
+
+        mod = """var foo = require('foo');
+        let c = require('chrome');"""
+        requires, problems, err = scan2(mod)
+        self.failUnlessKeysAre(requires, ["foo", "chrome"])
+        self.failUnlessEqual(problems, False)
+        self.failUnlessEqual(err, [])
+
+    def test_not_chrome(self):
+        # from bug 596595
+        mod = r'soughtLines: new RegExp("^\\s*(\\[[0-9 .]*\\])?\\s*\\(\\((EE|WW)\\)|.* [Cc]hipsets?: \\)|\\s*Backtrace")'
+        requires, problems, err = scan2(mod)
+        self.failUnlessKeysAre(requires, [])
+        self.failUnlessEqual((problems,err), (False, []))
+
+    def test_not_chrome2(self):
+        # from bug 655788
+        mod = r"var foo = 'some stuff Cr';"
+        requires, problems, err = scan2(mod)
+        self.failUnlessKeysAre(requires, [])
+        self.failUnlessEqual((problems,err), (False, []))
+
+class BadChrome(unittest.TestCase, Extra):
+    def test_bad_alias(self):
+        # using Components.* gets you an error, with a message that teaches
+        # you the correct approach.
+        mod = """let Cc = Components.classes;
+        let Cu = Components.utils;
+        """
+        requires, problems, err = scan2(mod)
+        self.failUnlessKeysAre(requires, [])
+        self.failUnlessEqual(problems, True)
+        self.failUnlessEqual(err[1], "The following lines from file fake.js:\n")
+        self.failUnlessEqual(err[2], "   1: let Cc = Components.classes;\n")
+        self.failUnlessEqual(err[3], "   2: let Cu = Components.utils;\n")
+        self.failUnlessEqual(err[4], "use 'Components' to access chrome authority. To do so, you need to add a\n")
+        self.failUnlessEqual(err[5], "line somewhat like the following:\n")
+        self.failUnlessEqual(err[7], '  const {Cc,Cu} = require("chrome");\n')
+        self.failUnlessEqual(err[9], "Then you can use any shortcuts to its properties that you import from the\n")
+
+    def test_bad_misc(self):
+        # If it looks like you're using something that doesn't have an alias,
+        # the warning also suggests a better way.
+        mod = """if (Components.isSuccessCode(foo))
+        """
+        requires, problems, err = scan2(mod)
+        self.failUnlessKeysAre(requires, [])
+        self.failUnlessEqual(problems, True)
+        self.failUnlessEqual(err[1], "The following lines from file fake.js:\n")
+        self.failUnlessEqual(err[2], "   1: if (Components.isSuccessCode(foo))\n")
+        self.failUnlessEqual(err[3], "use 'Components' to access chrome authority. To do so, you need to add a\n")
+        self.failUnlessEqual(err[4], "line somewhat like the following:\n")
+        self.failUnlessEqual(err[6], '  const {components} = require("chrome");\n')
+        self.failUnlessEqual(err[8], "Then you can use any shortcuts to its properties that you import from the\n")
+
+    def test_chrome_components(self):
+        # Bug 636145/774636: We no longer tolerate usages of "Components",
+        # even when adding `require("chrome")` to your module.
+        mod = """require("chrome");
+        var ios = Components.classes['@mozilla.org/network/io-service;1'];"""
+        requires, problems, err = scan2(mod)
+        self.failUnlessKeysAre(requires, ["chrome"])
+        self.failUnlessEqual(problems, True)
+        self.failUnlessEqual(err[1], "The following lines from file fake.js:\n")
+        self.failUnlessEqual(err[2], "   2: var ios = Components.classes['@mozilla.org/network/io-service;1'];\n")
+        self.failUnlessEqual(err[3], "use 'Components' to access chrome authority. To do so, you need to add a\n")
+        self.failUnlessEqual(err[4], "line somewhat like the following:\n")
+        self.failUnlessEqual(err[6], '  const {Cc} = require("chrome");\n')
+        self.failUnlessEqual(err[8], "Then you can use any shortcuts to its properties that you import from the\n")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_packaging.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_packaging.py
new file mode 100644
index 000000000..6944dc394
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_packaging.py
@@ -0,0 +1,117 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import unittest
+
+from cuddlefish import packaging
+from cuddlefish.bunch import Bunch
+
+tests_path = os.path.abspath(os.path.dirname(__file__))
+static_files_path = os.path.join(tests_path, 'static-files')
+
+def get_configs(pkg_name, dirname='static-files'):
+    root_path = os.path.join(tests_path, dirname)
+    pkg_path = os.path.join(root_path, 'packages', pkg_name)
+    if not (os.path.exists(pkg_path) and os.path.isdir(pkg_path)):
+        raise Exception('path does not exist: %s' % pkg_path)
+    target_cfg = packaging.get_config_in_dir(pkg_path)
+    pkg_cfg = packaging.build_config(root_path, target_cfg)
+    deps = packaging.get_deps_for_targets(pkg_cfg, [pkg_name])
+    build = packaging.generate_build_for_target(
+        pkg_cfg=pkg_cfg,
+        target=pkg_name,
+        deps=deps,
+        is_running_tests=True,
+        )
+    return Bunch(target_cfg=target_cfg, pkg_cfg=pkg_cfg, build=build)
+
+class PackagingTests(unittest.TestCase):
+    def test_bug_588661(self):
+        configs = get_configs('foo', 'bug-588661-files')
+        self.assertEqual(configs.build.loader,
+                         'foo/lib/foo-loader.js')
+
+    def test_bug_614712(self):
+        configs = get_configs('commonjs-naming', 'bug-614712-files')
+        packages = configs.pkg_cfg.packages
+        base = os.path.join(tests_path, 'bug-614712-files', 'packages')
+        self.assertEqual(packages['original-naming'].tests,
+                         [os.path.join(base, 'original-naming', 'tests')])
+        self.assertEqual(packages['commonjs-naming'].tests,
+                         [os.path.join(base, 'commonjs-naming', 'test')])
+
+    def test_basic(self):
+        configs = get_configs('aardvark')
+        packages = configs.pkg_cfg.packages
+
+        self.assertTrue('addon-sdk' in packages)
+        self.assertTrue('aardvark' in packages)
+        self.assertTrue('addon-sdk' in packages.aardvark.dependencies)
+        self.assertEqual(packages['addon-sdk'].loader, 'lib/sdk/loader/cuddlefish.js')
+        self.assertTrue(packages.aardvark.main == 'main')
+        self.assertTrue(packages.aardvark.version == "1.0")
+
+class PackagePath(unittest.TestCase):
+    def test_packagepath(self):
+        root_path = os.path.join(tests_path, 'static-files')
+        pkg_path = os.path.join(root_path, 'packages', 'minimal')
+        target_cfg = packaging.get_config_in_dir(pkg_path)
+        pkg_cfg = packaging.build_config(root_path, target_cfg)
+        base_packages = set(pkg_cfg.packages.keys())
+        ppath = [os.path.join(tests_path, 'bug-611495-files')]
+        pkg_cfg2 = packaging.build_config(root_path, target_cfg, packagepath=ppath)
+        all_packages = set(pkg_cfg2.packages.keys())
+        self.assertEqual(sorted(["jspath-one"]),
+                         sorted(all_packages - base_packages))
+
+class Directories(unittest.TestCase):
+    # for bug 652227
+    packages_path = os.path.join(tests_path, "bug-652227-files", "packages")
+    def get_config(self, pkg_name):
+        pkg_path = os.path.join(tests_path, "bug-652227-files", "packages",
+                                pkg_name)
+        return packaging.get_config_in_dir(pkg_path)
+
+    def test_explicit_lib(self):
+        # package.json provides .lib
+        p = self.get_config('explicit-lib')
+        self.assertEqual(os.path.abspath(p.lib[0]),
+                         os.path.abspath(os.path.join(self.packages_path,
+                                                      "explicit-lib",
+                                                      "alt2-lib")))
+
+    def test_directories_lib(self):
+        # package.json provides .directories.lib
+        p = self.get_config('explicit-dir-lib')
+        self.assertEqual(os.path.abspath(p.lib[0]),
+                         os.path.abspath(os.path.join(self.packages_path,
+                                                      "explicit-dir-lib",
+                                                      "alt-lib")))
+
+    def test_lib(self):
+        # package.json is empty, but lib/ exists
+        p = self.get_config("default-lib")
+        self.assertEqual(os.path.abspath(p.lib[0]),
+                         os.path.abspath(os.path.join(self.packages_path,
+                                                      "default-lib",
+                                                      "lib")))
+
+    def test_root(self):
+        # package.json is empty, no lib/, so files are in root
+        p = self.get_config('default-root')
+        self.assertEqual(os.path.abspath(p.lib[0]),
+                         os.path.abspath(os.path.join(self.packages_path,
+                                                      "default-root")))
+
+    def test_locale(self):
+        # package.json is empty, but locale/ exists and should be used
+        p = self.get_config("default-locale")
+        self.assertEqual(os.path.abspath(p.locale),
+                         os.path.abspath(os.path.join(self.packages_path,
+                                                      "default-locale",
+                                                      "locale")))
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_preflight.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_preflight.py
new file mode 100644
index 000000000..571b7911b
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_preflight.py
@@ -0,0 +1,147 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+import os, shutil
+import simplejson as json
+import unittest
+import hashlib
+import base64
+from cuddlefish import preflight
+from StringIO import StringIO
+
+class Util(unittest.TestCase):
+    def get_basedir(self):
+        return os.path.join(".test_tmp", self.id())
+    def make_basedir(self):
+        basedir = self.get_basedir()
+        if os.path.isdir(basedir):
+            here = os.path.abspath(os.getcwd())
+            assert os.path.abspath(basedir).startswith(here) # safety
+            shutil.rmtree(basedir)
+        os.makedirs(basedir)
+        return basedir
+
+    def test_base62(self):
+        for i in range(1000):
+            h = hashlib.sha1(str(i)).digest()
+            s1 = base64.b64encode(h, "AB").strip("=")
+            s2 = base64.b64encode(h).strip("=").replace("+","A").replace("/","B")
+            self.failUnlessEqual(s1, s2)
+
+    def write(self, config):
+        basedir = self.get_basedir()
+        fn = os.path.join(basedir, "package.json")
+        open(fn,"w").write(config)
+    def read(self):
+        basedir = self.get_basedir()
+        fn = os.path.join(basedir, "package.json")
+        return open(fn,"r").read()
+
+    def get_cfg(self):
+        cfg = json.loads(self.read())
+        if "name" not in cfg:
+            # the cfx parser always provides a name, even if package.json
+            # doesn't contain one
+            cfg["name"] = "pretend name"
+        return cfg
+
+    def parse(self, keydata):
+        fields = {}
+        fieldnames = []
+        for line in keydata.split("\n"):
+            if line.strip():
+                k,v = line.split(":", 1)
+                k = k.strip() ; v = v.strip()
+                fields[k] = v
+                fieldnames.append(k)
+        return fields, fieldnames
+
+    def test_preflight(self):
+        basedir = self.make_basedir()
+        fn = os.path.join(basedir, "package.json")
+
+        # empty config is not ok: need id (name is automatically supplied)
+        config_orig = "{}"
+        self.write(config_orig)
+        out = StringIO()
+        cfg = self.get_cfg()
+        config_was_ok, modified = preflight.preflight_config(cfg, fn,
+                                                             stderr=out)
+        self.failUnlessEqual(config_was_ok, False)
+        self.failUnlessEqual(modified, True)
+        backup_fn = os.path.join(basedir, "package.json.backup")
+        config_backup = open(backup_fn,"r").read()
+        self.failUnlessEqual(config_backup, config_orig)
+        config = json.loads(self.read())
+        self.failIf("name" in config)
+        self.failUnless("id" in config)
+        self.failUnless(config["id"].startswith("jid1-"), config["id"])
+        self.failUnlessEqual(out.getvalue().strip(),
+                             "No 'id' in package.json: creating a new ID for you.")
+        os.unlink(backup_fn)
+
+        # just a name? we add the id
+        config_orig = '{"name": "my-awesome-package"}'
+        self.write(config_orig)
+        out = StringIO()
+        cfg = self.get_cfg()
+        config_was_ok, modified = preflight.preflight_config(cfg, fn,
+                                                             stderr=out)
+        self.failUnlessEqual(config_was_ok, False)
+        self.failUnlessEqual(modified, True)
+        backup_fn = os.path.join(basedir, "package.json.backup")
+        config_backup = open(backup_fn,"r").read()
+        self.failUnlessEqual(config_backup, config_orig)
+        config = json.loads(self.read())
+        self.failUnlessEqual(config["name"], "my-awesome-package")
+        self.failUnless("id" in config)
+        self.failUnless(config["id"].startswith("jid1-"), config["id"])
+        jid = str(config["id"])
+        self.failUnlessEqual(out.getvalue().strip(),
+                             "No 'id' in package.json: creating a new ID for you.")
+        os.unlink(backup_fn)
+
+        # name and valid id? great! ship it!
+        config2 = '{"name": "my-awesome-package", "id": "%s"}' % jid
+        self.write(config2)
+        out = StringIO()
+        cfg = self.get_cfg()
+        config_was_ok, modified = preflight.preflight_config(cfg, fn,
+                                                             stderr=out)
+        self.failUnlessEqual(config_was_ok, True)
+        self.failUnlessEqual(modified, False)
+        config2a = self.read()
+        self.failUnlessEqual(config2a, config2)
+        self.failUnlessEqual(out.getvalue().strip(), "")
+
+        # name and anonymous ID? without asking to see its papers, ship it
+        config3 = '{"name": "my-old-skool-package", "id": "anonid0-deadbeef"}'
+        self.write(config3)
+        out = StringIO()
+        cfg = self.get_cfg()
+        config_was_ok, modified = preflight.preflight_config(cfg, fn,
+                                                             stderr=out)
+        self.failUnlessEqual(config_was_ok, True)
+        self.failUnlessEqual(modified, False)
+        config3a = self.read()
+        self.failUnlessEqual(config3a, config3)
+        self.failUnlessEqual(out.getvalue().strip(), "")
+
+        # name and old-style ID? with nostalgic trepidation, ship it
+        config4 = '{"name": "my-old-skool-package", "id": "foo@bar.baz"}'
+        self.write(config4)
+        out = StringIO()
+        cfg = self.get_cfg()
+        config_was_ok, modified = preflight.preflight_config(cfg, fn,
+                                                             stderr=out)
+        self.failUnlessEqual(config_was_ok, True)
+        self.failUnlessEqual(modified, False)
+        config4a = self.read()
+        self.failUnlessEqual(config4a, config4)
+        self.failUnlessEqual(out.getvalue().strip(), "")
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_property_parser.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_property_parser.py
new file mode 100644
index 000000000..4988f8ef5
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_property_parser.py
@@ -0,0 +1,93 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import unittest
+
+from cuddlefish.property_parser import parse, MalformedLocaleFileError
+
+class TestParser(unittest.TestCase):
+
+    def test_parse(self):
+        lines = [
+          # Comments are striped only if `#` is the first non-space character
+          "sharp=#can be in value",
+          "# comment",
+          "#key=value",
+          "  # comment2",
+
+          "keyWithNoValue=",
+          "valueWithSpaces=   ",
+          "valueWithMultilineSpaces=  \\",
+          "  \\",
+          "  ",
+
+          # All spaces before/after are striped
+          " key = value ",
+          "key2=value2",
+          # Keys can contain '%'
+          "%s key=%s value",
+
+          # Accept empty lines
+          "",
+          "   ",
+
+          # Multiline string must use backslash at end of lines
+          "multi=line\\", "value",
+          # With multiline string, left spaces are stripped ...
+          "some= spaces\\", " are\\  ", " stripped ",
+          # ... but not right spaces, except the last line!
+          "but=not \\", "all of \\", " them ",
+
+          # Explicit [other] plural definition
+          "explicitPlural[one] = one",
+          "explicitPlural[other] = other",
+
+          # Implicit [other] plural definition
+          "implicitPlural[one] = one",
+          "implicitPlural = other", # This key is the [other] one
+        ]
+        # Ensure that all lines end with a `\n`
+        # And that strings are unicode ones (parser code relies on it)
+        lines = [unicode(l + "\n") for l in lines]
+        pairs = parse(lines)
+        expected = {
+          "sharp": "#can be in value",
+
+          "key": "value",
+          "key2": "value2",
+          "%s key": "%s value",
+
+          "keyWithNoValue": "",
+          "valueWithSpaces": "",
+          "valueWithMultilineSpaces": "",
+
+          "multi": "linevalue",
+          "some": "spacesarestripped",
+          "but": "not all of them",
+
+          "implicitPlural": {
+            "one": "one",
+            "other": "other"
+          },
+          "explicitPlural": {
+            "one": "one",
+            "other": "other"
+          },
+        }
+        self.assertEqual(pairs, expected)
+
+    def test_exceptions(self):
+        self.failUnlessRaises(MalformedLocaleFileError, parse,
+                              ["invalid line with no key value"])
+        self.failUnlessRaises(MalformedLocaleFileError, parse,
+                              ["plural[one]=plural with no [other] value"])
+        self.failUnlessRaises(MalformedLocaleFileError, parse,
+                              ["multiline with no last empty line=\\"])
+        self.failUnlessRaises(MalformedLocaleFileError, parse,
+                              ["=no key"])
+        self.failUnlessRaises(MalformedLocaleFileError, parse,
+                              ["   =only spaces in key"])
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_rdf.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_rdf.py
new file mode 100644
index 000000000..5d9254e4e
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_rdf.py
@@ -0,0 +1,54 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import unittest
+import xml.dom.minidom
+import os.path
+
+from cuddlefish import rdf, packaging
+
+parent = os.path.dirname
+test_dir = parent(os.path.abspath(__file__))
+template_dir = os.path.join(parent(test_dir), "../../app-extension")
+
+class RDFTests(unittest.TestCase):
+    def testBug567660(self):
+        obj = rdf.RDF()
+        data = u'\u2026'.encode('utf-8')
+        x = '<?xml version="1.0" encoding="utf-8"?><blah>%s</blah>' % data
+        obj.dom = xml.dom.minidom.parseString(x)
+        self.assertEqual(obj.dom.documentElement.firstChild.nodeValue,
+                         u'\u2026')
+        self.assertEqual(str(obj).replace("\n",""), x.replace("\n",""))
+
+    def failUnlessIn(self, substring, s, msg=""):
+        if substring not in s:
+            self.fail("(%s) substring '%s' not in string '%s'"
+                      % (msg, substring, s))
+
+    def testUnpack(self):
+        basedir = os.path.join(test_dir, "bug-715340-files")
+        for n in ["pkg-1-pack", "pkg-2-unpack", "pkg-3-pack"]:
+            cfg = packaging.get_config_in_dir(os.path.join(basedir, n))
+            m = rdf.gen_manifest(template_dir, cfg, jid="JID")
+            if n.endswith("-pack"):
+                # these ones should remain packed
+                self.failUnlessEqual(m.get("em:unpack"), "false")
+                self.failUnlessIn("<em:unpack>false</em:unpack>", str(m), n)
+            else:
+                # and these should be unpacked
+                self.failUnlessEqual(m.get("em:unpack"), "true")
+                self.failUnlessIn("<em:unpack>true</em:unpack>", str(m), n)
+
+    def testTitle(self):
+        basedir = os.path.join(test_dir, 'bug-906359-files')
+        for n in ['title', 'fullName', 'none']:
+            cfg = packaging.get_config_in_dir(os.path.join(basedir, n))
+            m = rdf.gen_manifest(template_dir, cfg, jid='JID')
+            self.failUnlessEqual(m.get('em:name'), 'a long ' + n)
+            self.failUnlessIn('<em:name>a long ' + n + '</em:name>', str(m), n)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_runner.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_runner.py
new file mode 100644
index 000000000..26583abd1
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_runner.py
@@ -0,0 +1,27 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+def xulrunner_app_runner_doctests():
+    """
+    >>> import sys
+    >>> from cuddlefish import runner
+    >>> runner.XulrunnerAppRunner(binary='foo')
+    Traceback (most recent call last):
+    ...
+    Exception: Binary path does not exist foo
+
+    >>> runner.XulrunnerAppRunner(binary=sys.executable)
+    Traceback (most recent call last):
+    ...
+    ValueError: application.ini not found in cmdargs
+
+    >>> runner.XulrunnerAppRunner(binary=sys.executable,
+    ...                         cmdargs=['application.ini'])
+    Traceback (most recent call last):
+    ...
+    ValueError: file does not exist: 'application.ini'
+    """
+
+    pass
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_util.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_util.py
new file mode 100644
index 000000000..aa636a48c
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_util.py
@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+import unittest
+from cuddlefish.manifest import filter_filenames, filter_dirnames
+
+class Filter(unittest.TestCase):
+    def test_filter_filenames(self):
+        names = ["foo", "bar.js", "image.png",
+                 ".hidden", "foo~", ".foo.swp", "bar.js.swp"]
+        self.failUnlessEqual(sorted(filter_filenames(names)),
+                             sorted(["foo", "bar.js", "image.png"]))
+
+    def test_filter_dirnames(self):
+        names = ["subdir", "data", ".git", ".hg", ".svn", "defaults"]
+        self.failUnlessEqual(sorted(filter_dirnames(names)),
+                             sorted(["subdir", "data", "defaults"]))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_version.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_version.py
new file mode 100644
index 000000000..814c57c89
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_version.py
@@ -0,0 +1,28 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import unittest
+import shutil
+
+from cuddlefish._version import get_versions
+
+class Version(unittest.TestCase):
+    def get_basedir(self):
+        return os.path.join(".test_tmp", self.id())
+    def make_basedir(self):
+        basedir = self.get_basedir()
+        if os.path.isdir(basedir):
+            here = os.path.abspath(os.getcwd())
+            assert os.path.abspath(basedir).startswith(here) # safety
+            shutil.rmtree(basedir)
+        os.makedirs(basedir)
+        return basedir
+
+    def test_current_version(self):
+        # the SDK should be able to determine its own version. We don't care
+        # what it is, merely that it can be computed.
+        version = get_versions()["version"]
+        self.failUnless(isinstance(version, str), (version, type(version)))
+        self.failUnless(len(version) > 0, version)
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_xpi.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_xpi.py
new file mode 100644
index 000000000..bbefee3b2
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_xpi.py
@@ -0,0 +1,310 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import unittest
+import zipfile
+import pprint
+import shutil
+
+import simplejson as json
+from cuddlefish import xpi, packaging, manifest, buildJID
+from cuddlefish.tests import test_packaging
+from test_linker import up
+
+import xml.etree.ElementTree as ElementTree
+
+xpi_template_path = os.path.join(test_packaging.static_files_path,
+                                 'xpi-template')
+
+fake_manifest = '<RDF><!-- Extension metadata is here. --></RDF>'
+
+
+class Bug588119Tests(unittest.TestCase):
+    def makexpi(self, pkg_name):
+        self.xpiname = "%s.xpi" % pkg_name
+        create_xpi(self.xpiname, pkg_name, 'bug-588119-files')
+        self.xpi = zipfile.ZipFile(self.xpiname, 'r')
+        options = self.xpi.read('harness-options.json')
+        self.xpi_harness_options = json.loads(options)
+
+    def setUp(self):
+        self.xpiname = None
+        self.xpi = None
+
+    def tearDown(self):
+        if self.xpi:
+            self.xpi.close()
+        if self.xpiname and os.path.exists(self.xpiname):
+            os.remove(self.xpiname)
+
+    def testPackageWithImplicitIcon(self):
+        self.makexpi('implicit-icon')
+        assert 'icon.png' in self.xpi.namelist()
+
+    def testPackageWithImplicitIcon64(self):
+        self.makexpi('implicit-icon')
+        assert 'icon64.png' in self.xpi.namelist()
+
+    def testPackageWithExplicitIcon(self):
+        self.makexpi('explicit-icon')
+        assert 'icon.png' in self.xpi.namelist()
+
+    def testPackageWithExplicitIcon64(self):
+        self.makexpi('explicit-icon')
+        assert 'icon64.png' in self.xpi.namelist()
+
+    def testPackageWithNoIcon(self):
+        self.makexpi('no-icon')
+        assert 'icon.png' not in self.xpi.namelist()
+
+    def testIconPathNotInHarnessOptions(self):
+        self.makexpi('implicit-icon')
+        assert 'icon' not in self.xpi_harness_options
+
+    def testIcon64PathNotInHarnessOptions(self):
+        self.makexpi('implicit-icon')
+        assert 'icon64' not in self.xpi_harness_options
+
+class ExtraHarnessOptions(unittest.TestCase):
+    def setUp(self):
+        self.xpiname = None
+        self.xpi = None
+
+    def tearDown(self):
+        if self.xpi:
+            self.xpi.close()
+        if self.xpiname and os.path.exists(self.xpiname):
+            os.remove(self.xpiname)
+
+    def testOptions(self):
+        pkg_name = "extra-options"
+        self.xpiname = "%s.xpi" % pkg_name
+        create_xpi(self.xpiname, pkg_name, "bug-669274-files",
+                   extra_harness_options={"builderVersion": "futuristic"})
+        self.xpi = zipfile.ZipFile(self.xpiname, 'r')
+        options = self.xpi.read('harness-options.json')
+        hopts = json.loads(options)
+        self.failUnless("builderVersion" in hopts)
+        self.failUnlessEqual(hopts["builderVersion"], "futuristic")
+
+    def testBadOptionName(self):
+        pkg_name = "extra-options"
+        self.xpiname = "%s.xpi" % pkg_name
+        self.failUnlessRaises(xpi.HarnessOptionAlreadyDefinedError,
+                              create_xpi,
+                              self.xpiname, pkg_name, "bug-669274-files",
+                              extra_harness_options={"main": "already in use"})
+
+class SmallXPI(unittest.TestCase):
+    def setUp(self):
+        self.root = up(os.path.abspath(__file__), 4)
+    def get_linker_files_dir(self, name):
+        return os.path.join(up(os.path.abspath(__file__)), "linker-files", name)
+    def get_pkg(self, name):
+        d = self.get_linker_files_dir(name)
+        return packaging.get_config_in_dir(d)
+
+    def get_basedir(self):
+        return os.path.join(".test_tmp", self.id())
+    def make_basedir(self):
+        basedir = self.get_basedir()
+        if os.path.isdir(basedir):
+            here = os.path.abspath(os.getcwd())
+            assert os.path.abspath(basedir).startswith(here) # safety
+            shutil.rmtree(basedir)
+        os.makedirs(basedir)
+        return basedir
+
+    def test_contents(self):
+        target_cfg = self.get_pkg("three")
+        package_path = [self.get_linker_files_dir("three-deps")]
+        pkg_cfg = packaging.build_config(self.root, target_cfg,
+                                         packagepath=package_path)
+        deps = packaging.get_deps_for_targets(pkg_cfg,
+                                              [target_cfg.name, "addon-sdk"])
+        addon_sdk_dir = pkg_cfg.packages["addon-sdk"].lib[0]
+        m = manifest.build_manifest(target_cfg, pkg_cfg, deps, scan_tests=False)
+        used_files = list(m.get_used_files(True))
+        here = up(os.path.abspath(__file__))
+        def absify(*parts):
+            fn = os.path.join(here, "linker-files", *parts)
+            return os.path.abspath(fn)
+        expected = [absify(*parts) for parts in
+                    [("three", "lib", "main.js"),
+                     ("three-deps", "three-a", "lib", "main.js"),
+                     ("three-deps", "three-a", "lib", "subdir", "subfile.js"),
+                     ("three", "data", "msg.txt"),
+                     ("three", "data", "subdir", "submsg.txt"),
+                     ("three-deps", "three-b", "lib", "main.js"),
+                     ("three-deps", "three-c", "lib", "main.js"),
+                     ("three-deps", "three-c", "lib", "sub", "foo.js")
+                     ]]
+
+        add_addon_sdk= lambda path: os.path.join(addon_sdk_dir, path)
+        expected.extend([add_addon_sdk(module) for module in [
+            os.path.join("sdk", "self.js"),
+            os.path.join("sdk", "core", "promise.js"),
+            os.path.join("sdk", "net", "url.js"),
+            os.path.join("sdk", "util", "object.js"),
+            os.path.join("sdk", "util", "array.js"),
+            os.path.join("sdk", "preferences", "service.js")
+            ]])
+
+        missing = set(expected) - set(used_files)
+        extra = set(used_files) - set(expected)
+        self.failUnlessEqual(list(missing), [])
+        self.failUnlessEqual(list(extra), [])
+        used_deps = m.get_used_packages()
+
+        build = packaging.generate_build_for_target(pkg_cfg, target_cfg.name,
+                                                    used_deps,
+                                                    include_tests=False)
+        options = {'main': target_cfg.main}
+        options.update(build)
+        basedir = self.make_basedir()
+        xpi_name = os.path.join(basedir, "contents.xpi")
+        xpi.build_xpi(template_root_dir=xpi_template_path,
+                      manifest=fake_manifest,
+                      xpi_path=xpi_name,
+                      harness_options=options,
+                      limit_to=used_files)
+        x = zipfile.ZipFile(xpi_name, "r")
+        names = x.namelist()
+        expected = ["components/",
+                    "components/harness.js",
+                    # the real template also has 'bootstrap.js', but the fake
+                    # one in tests/static-files/xpi-template doesn't
+                    "harness-options.json",
+                    "install.rdf",
+                    "resources/",
+                    "resources/addon-sdk/",
+                    "resources/addon-sdk/lib/",
+                    "resources/addon-sdk/lib/sdk/",
+                    "resources/addon-sdk/lib/sdk/self.js",
+                    "resources/addon-sdk/lib/sdk/core/",
+                    "resources/addon-sdk/lib/sdk/util/",
+                    "resources/addon-sdk/lib/sdk/net/",
+                    "resources/addon-sdk/lib/sdk/core/promise.js",
+                    "resources/addon-sdk/lib/sdk/util/object.js",
+                    "resources/addon-sdk/lib/sdk/util/array.js",
+                    "resources/addon-sdk/lib/sdk/net/url.js",
+                    "resources/addon-sdk/lib/sdk/preferences/",
+                    "resources/addon-sdk/lib/sdk/preferences/service.js",
+                    "resources/three/",
+                    "resources/three/lib/",
+                    "resources/three/lib/main.js",
+                    "resources/three/data/",
+                    "resources/three/data/msg.txt",
+                    "resources/three/data/subdir/",
+                    "resources/three/data/subdir/submsg.txt",
+                    "resources/three-a/",
+                    "resources/three-a/lib/",
+                    "resources/three-a/lib/main.js",
+                    "resources/three-a/lib/subdir/",
+                    "resources/three-a/lib/subdir/subfile.js",
+                    "resources/three-b/",
+                    "resources/three-b/lib/",
+                    "resources/three-b/lib/main.js",
+                    "resources/three-c/",
+                    "resources/three-c/lib/",
+                    "resources/three-c/lib/main.js",
+                    "resources/three-c/lib/sub/",
+                    "resources/three-c/lib/sub/foo.js",
+                    # notably absent: three-a/lib/unused.js
+                    "locale/",
+                    "locale/fr-FR.json",
+                    "locales.json",
+                    ]
+        # showing deltas makes failures easier to investigate
+        missing = set(expected) - set(names)
+        extra = set(names) - set(expected)
+        self.failUnlessEqual((list(missing), list(extra)), ([], []))
+        self.failUnlessEqual(sorted(names), sorted(expected))
+
+        # check locale files
+        localedata = json.loads(x.read("locales.json"))
+        self.failUnlessEqual(sorted(localedata["locales"]), sorted(["fr-FR"]))
+        content = x.read("locale/fr-FR.json")
+        locales = json.loads(content)
+        # Locale files are merged into one.
+        # Conflicts are silently resolved by taking last package translation,
+        # so that we get "No" translation from three-c instead of three-b one.
+        self.failUnlessEqual(locales, json.loads(u'''
+          {
+            "No": "Nein",
+            "one": "un",
+            "What?": "Quoi?",
+            "Yes": "Oui",
+            "plural": {
+              "other": "other",
+              "one": "one"
+            },
+            "uft8_value": "\u00e9"
+          }'''))
+
+
+def document_dir(name):
+    if name in ['packages', 'xpi-template']:
+        dirname = os.path.join(test_packaging.static_files_path, name)
+        document_dir_files(dirname)
+    elif name == 'xpi-output':
+        create_xpi('test-xpi.xpi')
+        document_zip_file('test-xpi.xpi')
+        os.remove('test-xpi.xpi')
+    else:
+        raise Exception('unknown dir: %s' % name)
+
+def normpath(path):
+    """
+    Make a platform-specific relative path use '/' as a separator.
+    """
+
+    return path.replace(os.path.sep, '/')
+
+def document_zip_file(path):
+    zip = zipfile.ZipFile(path, 'r')
+    for name in sorted(zip.namelist()):
+        contents = zip.read(name)
+        lines = contents.splitlines()
+        if len(lines) == 1 and name.endswith('.json') and len(lines[0]) > 75:
+            # Ideally we would json-decode this, but it results
+            # in an annoying 'u' before every string literal,
+            # since json decoding makes all strings unicode.
+            contents = eval(contents)
+            contents = pprint.pformat(contents)
+            lines = contents.splitlines()
+        contents = "\n  ".join(lines)
+        print "%s:\n  %s" % (normpath(name), contents)
+    zip.close()
+
+def document_dir_files(path):
+    filename_contents_tuples = []
+    for dirpath, dirnames, filenames in os.walk(path):
+        relpath = dirpath[len(path)+1:]
+        for filename in filenames:
+            abspath = os.path.join(dirpath, filename)
+            contents = open(abspath, 'r').read()
+            contents = "\n  ".join(contents.splitlines())
+            relfilename = os.path.join(relpath, filename)
+            filename_contents_tuples.append((normpath(relfilename), contents))
+    filename_contents_tuples.sort()
+    for filename, contents in filename_contents_tuples:
+        print "%s:" % filename
+        print "  %s" % contents
+
+def create_xpi(xpiname, pkg_name='aardvark', dirname='static-files',
+               extra_harness_options={}):
+    configs = test_packaging.get_configs(pkg_name, dirname)
+    options = {'main': configs.target_cfg.main,
+               'jetpackID': buildJID(configs.target_cfg), }
+    options.update(configs.build)
+    xpi.build_xpi(template_root_dir=xpi_template_path,
+                  manifest=fake_manifest,
+                  xpi_path=xpiname,
+                  harness_options=options,
+                  extra_harness_options=extra_harness_options)
+
+if __name__ == '__main__':
+    unittest.main()
-- 
cgit v1.2.3