797936 - create_talos_zip.py creates a broken talos.cset.zip on Windows (and without any errors)

Status: RESOLVED FIXED

(Testing :: Talos, defect)

Description

[Ed Morley [:emorley]]

At least I know why my patches in bug 794799 failed on Android on Try.

$ python create_talos_zip.py
d:\srcdirs\build\talos\talos.41ab9bef35d7.zip

Diffing against a zip that jmaher produced, the following files were missing:
{
talos/mozdevice/__init__.py
talos/mozdevice/b2gemulator.py
talos/mozdevice/devicemanager.py
talos/mozdevice/devicemanagerADB.py
talos/mozdevice/devicemanagerSUT.py
talos/mozdevice/droid.py
talos/mozdevice/emulator.py
talos/mozdevice/emulator_battery.py
talos/mozdevice/mozprocess/__init__.py
talos/mozdevice/mozprocess/pid.py
talos/mozdevice/mozprocess/processhandler.py
talos/mozdevice/mozprocess/qijo.py
talos/mozdevice/mozprocess/winprocess.py
talos/mozdevice/mozprocess/wpk.py
talos/page_load_test/graphics/canvas.html
talos/page_load_test/graphics/path.html
talos/robocop.ini
talos/robotium.config
}

I'm presuming the last four are irrelevant (/due to working directory items getting caught up), and that the root problem here is that mozdevice isn't getting included on Windows.

Comment 1

[Ed Morley [:emorley]]

I annotated download and got:
{
url: https://raw.github.com/mozilla/mozbase/master/mozprocess/mozprocess/qijo.py
filename: mozdevice/mozprocess/qijo.py
dirname: d:\srcdirs\build\talos\talos\mozdevice/mozprocess
}

vs

{
url: http://pyyaml.org/export/360/pyyaml/trunk/lib/yaml/composer.py
filename: yaml/composer.py
dirname: d:\srcdirs\build\talos\talos\yaml
}

-> because the mozbase manifest contains paths whereas the others don't.

Comment 2

[Jeff Hammel]

This should be reversible by adding 

destination = destination.replace('/', os.path.sep)

at http://hg.mozilla.org/build/talos/file/6f0fb4ab3a0c/create_talos_zip.py#l114

However, I don't have time to test at the moment

Comment 3

[Ed Morley [:emorley]]

Attachment: Patch v1

Turns out there were two places that needed the correct separator - the line you mentioned and:
newfiles = [filename.replace('/', os.path.sep) for _,filename in manifest]

So this patch just fixes the manifest up itself, rather than playing bandage afterwards.

Comment 4

[Jeff Hammel]

Comment on attachment 668247 [details] [diff] [review]
Patch v1

lgtm, thanks!

Comment 5

[Ed Morley [:emorley]]

Thank you :-)

https://hg.mozilla.org/build/talos/rev/8a1c99c48de1