SeattleTestbed / softwareupdater

Software updater daemon
MIT License
1 stars 6 forks source link

Added cloning and copying of utf repo files #51

Closed choksi81 closed 9 years ago

choksi81 commented 9 years ago

'utf' directory is to be deleted from 'common' repo and to be cloned separately from its own repo. Hence, build-scripts needs to be updated to reflect that change. This PR takes care of that.

vladimir-v-diaz commented 9 years ago

Successfully tested on Linux and Python 2.7.6. Note: Had to pull in the changes from https://github.com/SeattleTestbed/softwareupdater/pull/50 (fix for missing import statements that hasn't been merged yet) so that the tests could run.

$ cd softwareupdater/
$ git checkout -b choksi81-cloning_utf_repo master
Switched to a new branch 'choksi81-cloning_utf_repo'
$ git pull https://github.com/choksi81/softwareupdater.git cloning_utf_repo
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (5/5), done.
From https://github.com/choksi81/softwareupdater
 * branch            cloning_utf_repo -> FETCH_HEAD
Updating d8f5b7f..2c6a47b
Fast-forward
 scripts/config_build.txt      | 4 ++--
 scripts/config_initialize.txt | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
$ cd scripts/
$ git pull https://github.com/vladimir-v-diaz/softwareupdater.git master
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (6/6), done.
Unpacking objects: 100% (9/9), done.
remote: Total 9 (delta 6), reused 6 (delta 3)
From https://github.com/vladimir-v-diaz/softwareupdater
 * branch            master     -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 softwareupdater.py | 61 +++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 26 deletions(-)
$ python initialize.py 
Checking out repo from https://github.com/SeattleTestbed/seattlelib_v2 ...
Done!
Checking out repo from https://github.com/SeattleTestbed/portability ...
Done!
Checking out repo from https://github.com/SeattleTestbed/repy_v2 ...
Done!
Checking out repo from https://github.com/SeattleTestbed/common ...
Done!
Checking out repo from https://github.com/SeattleTestbed/nodemanager ...
Done!
Checking out repo from https://github.com/SeattleTestbed/utf ...
Done!
$ python build.py -t
Building into /home/vlad/projects/seattletestbed/review/softwareupdater/RUNNABLE
Done building!
$ python ../RUNNABLE/utf.py -a
$ cd ../RUNNABLE/
$ python ut
utf.py                                   utfutil.pyc                              
utfutil.py                               ut_softwareupdaters_testupdaterlocal.py  
$ python ut
utf.py                                   utfutil.pyc                              
utfutil.py                               ut_softwareupdaters_testupdaterlocal.py  
$ python utf.py -a
Testing module: softwareupdaters
    Running: ut_softwareupdaters_testupdaterlocal.py            [ PASS ]
$
vladimir-v-diaz commented 9 years ago

Successfully tested in Windows 7 and Python 2.7.5

Note: Had to clone https://github.com/SeattleTestbed/softwareupdater/pull/50 (fix for missing import statements that hasn't been merged yet) so these tests could run.

C:\Users\vlad\projects>cd softwareupdater

C:\Users\vlad\projects\softwareupdater>git checkout -b choksi81-cloning_utf_rep
Switched to a new branch 'choksi81-cloning_utf_repo'

C:\Users\vlad\projects\softwareupdater>git pull https://github.com/choksi81/sof
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (5/5), done.
From https://github.com/choksi81/softwareupdater
 * branch            cloning_utf_repo -> FETCH_HEAD
Updating d8f5b7f..2c6a47b
Fast-forward
 scripts/config_build.txt      | 4 ++--
 scripts/config_initialize.txt | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

C:\Users\vlad\projects\softwareupdater>git pull https://github.com/vladimir-v-d
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 9 (delta 6), reused 6 (delta 3)
Unpacking objects: 100% (9/9), done.
From https://github.com/vladimir-v-diaz/softwareupdater
 * branch            master     -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 softwareupdater.py | 61 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 26 deletions(-)

C:\Users\vlad\projects\softwareupdater>cd scripts

C:\Users\vlad\projects\softwareupdater\scripts>python initialize.py
Checking out repo from https://github.com/SeattleTestbed/seattlelib_v2 ...
Done!
Checking out repo from https://github.com/SeattleTestbed/portability ...
Done!
Checking out repo from https://github.com/SeattleTestbed/repy_v2 ...
Done!
Checking out repo from https://github.com/SeattleTestbed/common ...
Done!
Checking out repo from https://github.com/SeattleTestbed/nodemanager ...
Done!
Checking out repo from https://github.com/SeattleTestbed/utf ...
Done!

C:\Users\vlad\projects\softwareupdater\scripts>python build.py -t
Building into C:\Users\vlad\projects\softwareupdater\RUNNABLE
Done building!

C:\Users\vlad\projects\softwareupdater\scripts>cd ../RUNNABLE

C:\Users\vlad\projects\softwareupdater\RUNNABLE>python utf.py -a
Testing module: softwareupdaters
        Running: ut_softwareupdaters_testupdaterlocal.py            [ PASS ]

C:\Users\vlad\projects\softwareupdater\RUNNABLE>