Ubuntu One Client

Merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-4 into lp:ubuntuone-client/stable-1-4

  1. timestamp-autofix-1-4
  2. Merge into stable-1-4
Proposed by Alejandro J. Cura on 2011-11-18
Status: Rejected
Rejected by: dobey on 2012-06-27
Proposed branch: lp:~alecu/ubuntuone-client/timestamp-autofix-1-4
Merge into: lp:ubuntuone-client/stable-1-4
Diff against target: 241 lines (+82/-22)
2 files modified
tests/syncdaemon/test_action_queue.py (+67/-8)
ubuntuone/syncdaemon/action_queue.py (+15/-14)
To merge this branch: bzr merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-4
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve on 2012-04-16
Natalia Bidart Approve on 2011-12-13
Diego Sarmentero (community) 2011-11-18 Abstain on 2011-11-23
Review via email: mp+82755@code.launchpad.net

Commit Message

Do a HEAD request on the server to get accurate timestamp (LP: #692597)

Description of the Change

Do a HEAD request on the server to get accurate timestamp (LP: #692597)

This branch depends on:
 * lp:~alecu/ubuntuone-storage-protocol/timestamp-autofix-1-4
 * lp:~alecu/ubuntu-sso-client/timestamp-autofix-1-0

To build it on linux, point autogen to the dependent branches, like this:
./autogen.sh --with-protocol=$HOME/canonical/ubuntuone-storage-protocol/timestamp-autofix-1-4/ --with-sso=$HOME/canonical/ubuntu-sso-client/timestamp-autofix-1-0/

To post a comment you must log in.
Diego Sarmentero (diegosarmentero) wrote :

Text conflict in Makefile.am
Text conflict in bin/ubuntuone-launch
Contents conflict in bin/ubuntuone-preferences
Text conflict in configure.ac
Text conflict in contrib/testing/testcase.py
Conflict adding files to gsd-plugin. Created directory.
Conflict because gsd-plugin is not versioned, but has versioned children. Versioned directory.
Contents conflict in gsd-plugin/gsd-ubuntuone.c
Contents conflict in gsd-plugin/gsd-ubuntuone.h
Contents conflict in gsd-plugin/test-send-signal.py
Text conflict in libsyncdaemon/Makefile.am
Text conflict in libsyncdaemon/syncdaemon-authentication.c
Conflict adding files to nautilus. Created directory.
Conflict because nautilus is not versioned, but has versioned children. Versioned directory.
Contents conflict in nautilus/ubuntuone-nautilus.c
Contents conflict in nautilus/ubuntuone-nautilus.h
Text conflict in po/POTFILES.in
Text conflict in tests/platform/linux/test_dbus.py
Text conflict in tests/syncdaemon/test_action_queue.py
Text conflict in tests/syncdaemon/test_eventqueue.py
Text conflict in tests/syncdaemon/test_fsm.py
Text conflict in tests/syncdaemon/test_localrescan.py
Text conflict in tests/syncdaemon/test_vm.py
Text conflict in ubuntuone/clientdefs.py.in
Text conflict in ubuntuone/syncdaemon/action_queue.py
Contents conflict in ubuntuone/syncdaemon/dbus_interface.py
Text conflict in ubuntuone/syncdaemon/event_queue.py
Text conflict in ubuntuone/syncdaemon/filesystem_manager.py
Text conflict in ubuntuone/syncdaemon/local_rescan.py
Text conflict in ubuntuone/syncdaemon/sync.py
Text conflict in ubuntuone/syncdaemon/volume_manager.py
31 conflicts encountered.

review: Needs Fixing
Diego Sarmentero (diegosarmentero) :
review: Abstain
Natalia Bidart (nataliabidart) wrote :

Looks great, test pass, IRL tested.

review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (7.9 KiB)

The attempt to merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-4 into lp:ubuntuone-client/stable-1-4 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... st...

Read more...

Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (7.9 KiB)

The attempt to merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-4 into lp:ubuntuone-client/stable-1-4 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... st...

Read more...

Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (7.9 KiB)

The attempt to merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-4 into lp:ubuntuone-client/stable-1-4 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... st...

Read more...

Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (8.8 KiB)

The attempt to merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-4 into lp:ubuntuone-client/stable-1-4 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-debug --with-sso=/home/tarmac/cache/ubuntu-sso-client/stable-1-0 --with-protocol=/home/tarmac/cache/ubuntuone-storage-protocol/stable-1-4 ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
chec...

Read more...

Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (7.9 KiB)

The attempt to merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-4 into lp:ubuntuone-client/stable-1-4 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... st...

Read more...

Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (7.7 KiB)

The attempt to merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-4 into lp:ubuntuone-client/stable-1-4 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... st...

Read more...

Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (107.5 KiB)

The attempt to merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-4 into lp:ubuntuone-client/stable-1-4 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-debug --with-sso=/home/tarmac/cache/ubuntu-sso-client/stable-1-0 --with-protocol=/home/tarmac/cache/ubuntuone-storage-protocol/stable-1-4 ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
chec...

Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (107.7 KiB)

The attempt to merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-4 into lp:ubuntuone-client/stable-1-4 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-debug --with-sso=/home/tarmac/cache/ubuntu-sso-client/stable-1-0 --with-protocol=/home/tarmac/cache/ubuntuone-storage-protocol/stable-1-4 ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
chec...

Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (7.9 KiB)

The attempt to merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-4 into lp:ubuntuone-client/stable-1-4 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... st...

Read more...

Manuel de la Peña (mandel) wrote :

Looks ok, I've noticed that there are some issues when landing this to tarmac, I'll approve to see if this have been fix, if Not I'll contact dobey.

review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (7.9 KiB)

The attempt to merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-4 into lp:ubuntuone-client/stable-1-4 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... st...

Read more...

dobey (dobey) wrote :

As this is the version that was on Maverick, which is EOL now, I'm just going to reject this to get it out of the way.

Unmerged revisions

755. By Alejandro J. Cura on 2011-11-23

fix year in file headers

754. By Alejandro J. Cura on 2011-11-18

fixes for failing tests

753. By Alejandro J. Cura on 2011-11-18

Do a HEAD request on the server to get accurate timestamp (LP: #692597)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/syncdaemon/test_action_queue.py'
2--- tests/syncdaemon/test_action_queue.py 2010-12-09 13:47:21 +0000
3+++ tests/syncdaemon/test_action_queue.py 2011-11-23 19:57:23 +0000
4@@ -3,7 +3,7 @@
5 # Author: John R. Lenton <john.lenton@canonical.com>
6 # Author: Natalia B. Bidart <natalia.bidart@canonical.com>
7 #
8-# Copyright 2009 Canonical Ltd.
9+# Copyright 2009, 2011 Canonical Ltd.
10 #
11 # This program is free software: you can redistribute it and/or modify it
12 # under the terms of the GNU General Public License version 3, as published
13@@ -47,6 +47,7 @@
14 from ubuntuone.storageprotocol import (
15 client, errors, protocol_pb2, request
16 )
17+from ubuntuone.syncdaemon import action_queue
18 from ubuntuone.syncdaemon import states
19 from ubuntuone.syncdaemon.action_queue import (
20 ActionQueue, ActionQueueCommand, ChangePublicAccess, CreateUDF,
21@@ -1966,7 +1967,8 @@
22 return StringIO(
23 '{"is_public": true, "public_url": "http://example.com"}')
24
25- from ubuntuone.syncdaemon import action_queue
26+ self.patch(action_queue.timestamp_checker, "get_faithful_time",
27+ lambda: 1)
28 action_queue.urlopen = check
29 try:
30 res = self.command._change_public_access_http()
31@@ -1976,6 +1978,22 @@
32 self.assertEqual(
33 {'is_public': True, 'public_url': 'http://example.com'}, res)
34
35+ def test_change_public_access_http_uses_timestamp(self):
36+ """The timestamp is used for oauth signing."""
37+ fake_timestamp = 12345678
38+
39+ def fake_urlopen(request):
40+ """A fake urlopen."""
41+ auth = request.headers["Authorization"]
42+ expected = 'oauth_timestamp="%d"' % fake_timestamp
43+ self.assertIn(expected, auth)
44+ return StringIO("[]")
45+
46+ self.patch(action_queue.timestamp_checker, "get_faithful_time",
47+ lambda: fake_timestamp)
48+ self.patch(action_queue, "urlopen", fake_urlopen)
49+ self.command._change_public_access_http()
50+
51 def test_handle_success_push_event(self):
52 """Test AQ_CHANGE_PUBLIC_ACCESS_OK is pushed on success."""
53 response = {'is_public': True, 'public_url': 'http://example.com'}
54@@ -2072,6 +2090,8 @@
55 '"http://example.com"}]' % (nodekey, nodekey_2, volume_id))
56
57 from ubuntuone.syncdaemon import action_queue
58+ self.patch(action_queue.timestamp_checker, "get_faithful_time",
59+ lambda: 1)
60 action_queue.urlopen = check
61 try:
62 res = self.command._get_public_files_http()
63@@ -2083,6 +2103,22 @@
64 'volume_id': str(volume_id),
65 'public_url': 'http://example.com'}], res)
66
67+ def test_get_public_files_http_uses_timestamp(self):
68+ """The timestamp is used for oauth signing."""
69+ fake_timestamp = 12345678
70+
71+ def fake_urlopen(request):
72+ """A fake urlopen."""
73+ auth = request.headers["Authorization"]
74+ expected = 'oauth_timestamp="%d"' % fake_timestamp
75+ self.assertIn(expected, auth)
76+ return StringIO("[]")
77+
78+ self.patch(action_queue.timestamp_checker, "get_faithful_time",
79+ lambda: fake_timestamp)
80+ self.patch(action_queue, "urlopen", fake_urlopen)
81+ self.command._get_public_files_http()
82+
83 def test_handle_success_push_event(self):
84 """Test AQ_PUBLIC_FILES_LIST_OK is pushed on success."""
85 response = [{'node_id': uuid.uuid4(), 'volume_id':None,
86@@ -2547,11 +2583,12 @@
87 """Test proper handling of the access level in the http case."""
88 # replace _create_share_http with a fake, just to check the args
89 d = defer.Deferred()
90- def check_create_http(self, node_id, user, name, read_only, deferred):
91+
92+ def check_create_http(self, node_id, user, name, read_only):
93 """Fire the deferred with the args."""
94 d.callback((node_id, user, name, read_only))
95- deferred.callback(None)
96- CreateShare._create_share_http = check_create_http
97+
98+ self.patch(CreateShare, "_create_share_http", check_create_http)
99 command = CreateShare(self.request_queue, 'node_id',
100 'share_to@example.com', 'share_name',
101 'Modify', 'marker')
102@@ -2569,11 +2606,12 @@
103 """Test proper handling of the access level in the http case."""
104 # replace _create_share_http with a fake, just to check the args
105 d = defer.Deferred()
106- def check_create_http(self, node_id, user, name, read_only, deferred):
107+
108+ def check_create_http(self, node_id, user, name, read_only):
109 """Fire the deferred with the args."""
110 d.callback((node_id, user, name, read_only))
111- deferred.callback(None)
112- CreateShare._create_share_http = check_create_http
113+
114+ self.patch(CreateShare, "_create_share_http", check_create_http)
115 command = CreateShare(self.request_queue, 'node_id',
116 'share_to@example.com', 'share_name',
117 'View', 'marker')
118@@ -2585,6 +2623,27 @@
119 self.assertEqual('share_name', name)
120 self.assertTrue(read_only)
121
122+ @defer.inlineCallbacks
123+ def test_create_share_http_uses_timestamp(self):
124+ """The timestamp is used for oauth signing."""
125+ fake_timestamp = 12345678
126+
127+ def fake_urlopen(request):
128+ """A fake urlopen."""
129+ auth = request.headers["Authorization"]
130+ expected = 'oauth_timestamp="%d"' % fake_timestamp
131+ self.assertIn(expected, auth)
132+
133+ self.patch(action_queue.timestamp_checker, "get_faithful_time",
134+ lambda: fake_timestamp)
135+ self.patch(action_queue, "urlopen", fake_urlopen)
136+ self.user_connect()
137+ command = CreateShare(self.request_queue, 'node_id',
138+ 'share_to@example.com', 'share_name',
139+ 'View', 'marker')
140+ self.assertTrue(command.use_http, 'CreateShare should be in http mode')
141+ yield command._run()
142+
143 def test_possible_markers(self):
144 """Test that it returns the correct values."""
145 cmd = CreateShare(self.request_queue, 'node_id', 'shareto@example.com',
146
147=== modified file 'ubuntuone/syncdaemon/action_queue.py'
148--- ubuntuone/syncdaemon/action_queue.py 2010-12-09 13:47:21 +0000
149+++ ubuntuone/syncdaemon/action_queue.py 2011-11-23 19:57:23 +0000
150@@ -3,7 +3,7 @@
151 # Author: John Lenton <john.lenton@canonical.com>
152 # Author: Natalia B. Bidart <natalia.bidart@canonical.com>
153 #
154-# Copyright 2009 Canonical Ltd.
155+# Copyright 2009, 2011 Canonical Ltd.
156 #
157 # This program is free software: you can redistribute it and/or modify it
158 # under the terms of the GNU General Public License version 3, as published
159@@ -50,6 +50,7 @@
160
161 from oauth import oauth
162 from ubuntuone.storageprotocol import protocol_pb2
163+from ubuntu_sso.utils import timestamp_checker
164 from ubuntuone.storageprotocol import errors as protocol_errors
165 from ubuntuone.storageprotocol.client import (
166 ThrottlingStorageClient, ThrottlingStorageClientFactory
167@@ -1642,14 +1643,17 @@
168 if share_to and re.match(EREGEX, share_to):
169 self.use_http = True
170
171- def _create_share_http(self, node_id, user, name, read_only, deferred):
172+ def _create_share_http(self, node_id, user, name, read_only):
173 """Create a share using the HTTP Web API method."""
174
175 url = "https://one.ubuntu.com/files/api/offer_share/"
176 method = oauth.OAuthSignatureMethod_PLAINTEXT()
177+ timestamp = timestamp_checker.get_faithful_time()
178+ parameters = {"oauth_timestamp": timestamp}
179 request = oauth.OAuthRequest.from_consumer_and_token(
180 http_url=url,
181 http_method="POST",
182+ parameters=parameters,
183 oauth_consumer=self.action_queue.consumer,
184 token=self.action_queue.token)
185 request.sign_request(method, self.action_queue.consumer,
186@@ -1661,12 +1665,7 @@
187 pdata = urlencode(data)
188 headers = request.to_header()
189 req = Request(url, pdata, headers)
190- try:
191- urlopen(req)
192- except HTTPError, e:
193- deferred.errback(Failure(e))
194-
195- deferred.callback(None)
196+ urlopen(req)
197
198 def _run(self):
199 """
200@@ -1674,13 +1673,9 @@
201 """
202 if self.use_http:
203 # External user, do the HTTP REST method
204- deferred = defer.Deferred()
205- d = threads.deferToThread(self._create_share_http,
206+ return threads.deferToThread(self._create_share_http,
207 self.node_id, self.share_to,
208- self.name, self.access_level != 'Modify',
209- deferred)
210- d.addErrback(deferred.errback)
211- return deferred
212+ self.name, self.access_level != 'Modify')
213 else:
214 return self.action_queue.client.create_share(self.node_id,
215 self.share_to,
216@@ -1968,9 +1963,12 @@
217
218 url = "https://one.ubuntu.com/files/api/set_public/%s" % (node_key,)
219 method = oauth.OAuthSignatureMethod_PLAINTEXT()
220+ timestamp = timestamp_checker.get_faithful_time()
221+ parameters = {"oauth_timestamp": timestamp}
222 request = oauth.OAuthRequest.from_consumer_and_token(
223 http_url=url,
224 http_method="POST",
225+ parameters=parameters,
226 oauth_consumer=self.action_queue.consumer,
227 token=self.action_queue.token)
228 request.sign_request(method, self.action_queue.consumer,
229@@ -2022,9 +2020,12 @@
230 """Get public files list using the HTTP Web API method."""
231
232 method = oauth.OAuthSignatureMethod_PLAINTEXT()
233+ timestamp = timestamp_checker.get_faithful_time()
234+ parameters = {"oauth_timestamp": timestamp}
235 request = oauth.OAuthRequest.from_consumer_and_token(
236 http_url=self._url,
237 http_method="GET",
238+ parameters=parameters,
239 oauth_consumer=self.action_queue.consumer,
240 token=self.action_queue.token)
241 request.sign_request(method, self.action_queue.consumer,

Subscribers

People subscribed via source and target branches