[Box Backup-commit] [boxbackup/boxbackup] df1a19: Rename global TLSContext variable to avoid conflic...

GitHub noreply at github.com
Mon Sep 21 18:07:35 BST 2015


  Branch: refs/heads/master
  Home:   https://github.com/boxbackup/boxbackup
  Commit: df1a19ece5c1d308c4d08a694309592aa566611f
      https://github.com/boxbackup/boxbackup/commit/df1a19ece5c1d308c4d08a694309592aa566611f
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M test/bbackupd/testbbackupd.cpp

  Log Message:
  -----------
  Rename global TLSContext variable to avoid conflicts.

"context" might easily be used in a test function, and doesn't follow our
naming convention anyway, so renamed to sTlsContext.


  Commit: 2cbdea2166057c3c3996e733d78048d528fa694e
      https://github.com/boxbackup/boxbackup/commit/2cbdea2166057c3c3996e733d78048d528fa694e
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M bin/bbackupd/BackupClientContext.cpp
    M bin/bbackupd/BackupClientContext.h
    M lib/backupstore/BackupStoreFileEncodeStream.h
    M test/backupstorepatch/testbackupstorepatch.cpp
    M test/bbackupd/testbbackupd.cpp

  Log Message:
  -----------
  Remove all timing dependency from test_ssl_keepalives().

This test has always been fragile, and usually fails on Travis for reasons
unknown, so replace the log parsing and intercepts with simple mocking code.
This doesn't cover 100% of what the old test did, including diff timer aborts
and the number of blocks used by the uploaded files, but it should be
completely robust.


  Commit: 277e33fa0de680e2e25a271e7575a376bcb013dd
      https://github.com/boxbackup/boxbackup/commit/277e33fa0de680e2e25a271e7575a376bcb013dd
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge branch 'master' into fix_travis_ssl_keepalive_test


  Commit: 72bff4f167661743d5f4b4056dec3a639e84f08e
      https://github.com/boxbackup/boxbackup/commit/72bff4f167661743d5f4b4056dec3a639e84f08e
  Author: Chris Wilson <qris at users.noreply.github.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M bin/bbackupd/BackupClientContext.cpp
    M bin/bbackupd/BackupClientContext.h
    M lib/backupstore/BackupStoreFileEncodeStream.h
    M test/backupstorepatch/testbackupstorepatch.cpp
    M test/bbackupd/testbbackupd.cpp

  Log Message:
  -----------
  Merge pull request #6 from boxbackup/fix_travis_ssl_keepalive_test

Fix travis ssl keepalive test.

Tests pass on Travis, merging.


Compare: https://github.com/boxbackup/boxbackup/compare/b9153d7f32bd...72bff4f16766


More information about the Boxbackup-commit mailing list