mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-04-17 23:46:09 +00:00
Merge remote-tracking branch 'origin/master' into 3795-istorageserver-tests-part-2
This commit is contained in:
commit
b835a671ce
@ -271,6 +271,11 @@ jobs:
|
||||
# in the project source checkout.
|
||||
path: "/tmp/project/_trial_temp/test.log"
|
||||
|
||||
- store_artifacts: &STORE_ELIOT_LOG
|
||||
# Despite passing --workdir /tmp to tox above, it still runs trial
|
||||
# in the project source checkout.
|
||||
path: "/tmp/project/eliot.log"
|
||||
|
||||
- store_artifacts: &STORE_OTHER_ARTIFACTS
|
||||
# Store any other artifacts, too. This is handy to allow other jobs
|
||||
# sharing most of the definition of this one to be able to
|
||||
@ -413,6 +418,7 @@ jobs:
|
||||
- run: *RUN_TESTS
|
||||
- store_test_results: *STORE_TEST_RESULTS
|
||||
- store_artifacts: *STORE_TEST_LOG
|
||||
- store_artifacts: *STORE_ELIOT_LOG
|
||||
- store_artifacts: *STORE_OTHER_ARTIFACTS
|
||||
- run: *SUBMIT_COVERAGE
|
||||
|
||||
|
13
.github/workflows/ci.yml
vendored
13
.github/workflows/ci.yml
vendored
@ -76,13 +76,18 @@ jobs:
|
||||
- name: Run tox for corresponding Python version
|
||||
run: python -m tox
|
||||
|
||||
- name: Upload eliot.log in case of failure
|
||||
- name: Upload eliot.log
|
||||
uses: actions/upload-artifact@v1
|
||||
if: failure()
|
||||
with:
|
||||
name: eliot.log
|
||||
path: eliot.log
|
||||
|
||||
- name: Upload trial log
|
||||
uses: actions/upload-artifact@v1
|
||||
with:
|
||||
name: test.log
|
||||
path: _trial_temp/test.log
|
||||
|
||||
# Upload this job's coverage data to Coveralls. While there is a GitHub
|
||||
# Action for this, as of Jan 2021 it does not support Python coverage
|
||||
# files - only lcov files. Therefore, we use coveralls-python, the
|
||||
@ -136,7 +141,7 @@ jobs:
|
||||
# See notes about parallel builds on GitHub Actions at
|
||||
# https://coveralls-python.readthedocs.io/en/latest/usage/configuration.html
|
||||
finish-coverage-report:
|
||||
needs:
|
||||
needs:
|
||||
- "coverage"
|
||||
runs-on: "ubuntu-latest"
|
||||
container: "python:3-slim"
|
||||
@ -173,7 +178,7 @@ jobs:
|
||||
- name: Install Tor [Ubuntu]
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
run: sudo apt install tor
|
||||
|
||||
|
||||
# TODO: See https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3744.
|
||||
# We have to use an older version of Tor for running integration
|
||||
# tests on macOS.
|
||||
|
2
NEWS.rst
2
NEWS.rst
@ -1188,7 +1188,7 @@ Precautions when Upgrading
|
||||
.. _`#1915`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1915
|
||||
.. _`#1926`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1926
|
||||
.. _`message to the tahoe-dev mailing list`:
|
||||
https://tahoe-lafs.org/pipermail/tahoe-dev/2013-March/008096.html
|
||||
https://lists.tahoe-lafs.org/pipermail/tahoe-dev/2013-March/008079.html
|
||||
|
||||
|
||||
Release 1.9.2 (2012-07-03)
|
||||
|
@ -80,7 +80,7 @@ Get involved with the Tahoe-LAFS community:
|
||||
|
||||
- Join our `weekly conference calls <https://www.tahoe-lafs.org/trac/tahoe-lafs/wiki/WeeklyMeeting>`__ with core developers and interested community members.
|
||||
|
||||
- Subscribe to `the tahoe-dev mailing list <https://www.tahoe-lafs.org/cgi-bin/mailman/listinfo/tahoe-dev>`__, the community forum for discussion of Tahoe-LAFS design, implementation, and usage.
|
||||
- Subscribe to `the tahoe-dev mailing list <https://lists.tahoe-lafs.org/mailman/listinfo/tahoe-dev>`__, the community forum for discussion of Tahoe-LAFS design, implementation, and usage.
|
||||
|
||||
🤗 Contributing
|
||||
---------------
|
||||
@ -102,6 +102,8 @@ Before authoring or reviewing a patch, please familiarize yourself with the `Cod
|
||||
|
||||
We would like to thank `Fosshost <https://fosshost.org>`__ for supporting us with hosting services. If your open source project needs help, you can apply for their support.
|
||||
|
||||
We are grateful to `Oregon State University Open Source Lab <https://osuosl.org/>`__ for hosting tahoe-dev mailing list.
|
||||
|
||||
❓ FAQ
|
||||
------
|
||||
|
||||
|
@ -65,4 +65,4 @@ If you are working on MacOS or a Linux distribution which does not have Tahoe-LA
|
||||
|
||||
If you are looking to hack on the source code or run pre-release code, we recommend you install Tahoe-LAFS on a `virtualenv` instance. To learn more, see :doc:`install-on-linux`.
|
||||
|
||||
You can always write to the `tahoe-dev mailing list <https://tahoe-lafs.org/cgi-bin/mailman/listinfo/tahoe-dev>`_ or chat on the `Libera.chat IRC <irc://irc.libera.chat/%23tahoe-lafs>`_ if you are not able to get Tahoe-LAFS up and running on your deployment.
|
||||
You can always write to the `tahoe-dev mailing list <https://lists.tahoe-lafs.org/mailman/listinfo/tahoe-dev>`_ or chat on the `Libera.chat IRC <irc://irc.libera.chat/%23tahoe-lafs>`_ if you are not able to get Tahoe-LAFS up and running on your deployment.
|
||||
|
@ -177,7 +177,7 @@ mutable files, you may be able to avoid the potential for "rollback"
|
||||
failure.
|
||||
|
||||
A future version of Tahoe will include a fix for this issue. Here is
|
||||
[https://tahoe-lafs.org/pipermail/tahoe-dev/2008-May/000630.html the
|
||||
[https://lists.tahoe-lafs.org/pipermail/tahoe-dev/2008-May/000628.html the
|
||||
mailing list discussion] about how that future version will work.
|
||||
|
||||
|
||||
|
@ -268,7 +268,7 @@ For known security issues see
|
||||
.PP
|
||||
Tahoe-LAFS home page: <https://tahoe-lafs.org/>
|
||||
.PP
|
||||
tahoe-dev mailing list: <https://tahoe-lafs.org/cgi-bin/mailman/listinfo/tahoe-dev>
|
||||
tahoe-dev mailing list: <https://lists.tahoe-lafs.org/mailman/listinfo/tahoe-dev>
|
||||
.SH COPYRIGHT
|
||||
.PP
|
||||
Copyright \@ 2006\[en]2013 The Tahoe-LAFS Software Foundation
|
||||
|
@ -178,8 +178,8 @@ Announcing the Release Candidate
|
||||
````````````````````````````````
|
||||
|
||||
The release-candidate should be announced by posting to the
|
||||
mailing-list (tahoe-dev@tahoe-lafs.org). For example:
|
||||
https://tahoe-lafs.org/pipermail/tahoe-dev/2020-October/009995.html
|
||||
mailing-list (tahoe-dev@lists.tahoe-lafs.org). For example:
|
||||
https://lists.tahoe-lafs.org/pipermail/tahoe-dev/2020-October/009978.html
|
||||
|
||||
|
||||
Is The Release Done Yet?
|
||||
|
@ -238,7 +238,7 @@ You can chat with other users of and hackers of this software on the
|
||||
#tahoe-lafs IRC channel at ``irc.libera.chat``, or on the `tahoe-dev mailing
|
||||
list`_.
|
||||
|
||||
.. _tahoe-dev mailing list: https://tahoe-lafs.org/cgi-bin/mailman/listinfo/tahoe-dev
|
||||
.. _tahoe-dev mailing list: https://lists.tahoe-lafs.org/mailman/listinfo/tahoe-dev
|
||||
|
||||
|
||||
Complain
|
||||
|
@ -16,7 +16,7 @@ if git diff-index --quiet HEAD; then
|
||||
fi
|
||||
|
||||
git config user.name 'Build Automation'
|
||||
git config user.email 'tahoe-dev@tahoe-lafs.org'
|
||||
git config user.email 'tahoe-dev@lists.tahoe-lafs.org'
|
||||
|
||||
git add tahoe-deps.json tahoe-ported.json
|
||||
git commit -m "\
|
||||
|
1
newsfragments/3782.documentation
Normal file
1
newsfragments/3782.documentation
Normal file
@ -0,0 +1 @@
|
||||
tahoe-dev mailing list is now at tahoe-dev@lists.tahoe-lafs.org.
|
0
newsfragments/3792.minor
Normal file
0
newsfragments/3792.minor
Normal file
@ -155,7 +155,7 @@ Planet Earth
|
||||
[4] https://github.com/tahoe-lafs/tahoe-lafs/blob/tahoe-lafs-1.15.1/COPYING.GPL
|
||||
[5] https://github.com/tahoe-lafs/tahoe-lafs/blob/tahoe-lafs-1.15.1/COPYING.TGPPL.rst
|
||||
[6] https://tahoe-lafs.readthedocs.org/en/tahoe-lafs-1.15.1/INSTALL.html
|
||||
[7] https://tahoe-lafs.org/cgi-bin/mailman/listinfo/tahoe-dev
|
||||
[7] https://lists.tahoe-lafs.org/mailman/listinfo/tahoe-dev
|
||||
[8] https://tahoe-lafs.org/trac/tahoe-lafs/roadmap
|
||||
[9] https://github.com/tahoe-lafs/tahoe-lafs/blob/master/CREDITS
|
||||
[10] https://tahoe-lafs.org/trac/tahoe-lafs/wiki/Dev
|
||||
|
2
setup.py
2
setup.py
@ -359,7 +359,7 @@ setup(name="tahoe-lafs", # also set in __init__.py
|
||||
description='secure, decentralized, fault-tolerant file store',
|
||||
long_description=open('README.rst', 'r', encoding='utf-8').read(),
|
||||
author='the Tahoe-LAFS project',
|
||||
author_email='tahoe-dev@tahoe-lafs.org',
|
||||
author_email='tahoe-dev@lists.tahoe-lafs.org',
|
||||
url='https://tahoe-lafs.org/',
|
||||
license='GNU GPL', # see README.rst -- there is an alternative licence
|
||||
cmdclass={"update_version": UpdateVersion,
|
||||
|
@ -211,11 +211,8 @@ class IStorageServerImmutableAPIsTestsMixin(object):
|
||||
"""
|
||||
Shares that are fully written to can be read.
|
||||
|
||||
1. The result is not affected by the order in which writes
|
||||
happened, only by their offsets.
|
||||
|
||||
2. When overlapping writes happen, the resulting read returns the
|
||||
latest written value.
|
||||
The result is not affected by the order in which writes
|
||||
happened, only by their offsets.
|
||||
"""
|
||||
storage_index, renew_secret, cancel_secret = (
|
||||
new_storage_index(),
|
||||
@ -241,15 +238,8 @@ class IStorageServerImmutableAPIsTestsMixin(object):
|
||||
yield allocated[2].callRemote("write", 0, b"3" * 512)
|
||||
yield allocated[2].callRemote("close")
|
||||
|
||||
# Bucket 3 has an overlapping write.
|
||||
yield allocated[3].callRemote("write", 0, b"5" * 20)
|
||||
# The second write will overwrite the first.
|
||||
yield allocated[3].callRemote("write", 0, b"6" * 24)
|
||||
yield allocated[3].callRemote("write", 24, b"7" * 1000)
|
||||
yield allocated[3].callRemote("close")
|
||||
|
||||
buckets = yield self.storage_server.get_buckets(storage_index)
|
||||
self.assertEqual(set(buckets.keys()), {1, 2, 3})
|
||||
self.assertEqual(set(buckets.keys()), {1, 2})
|
||||
|
||||
self.assertEqual(
|
||||
(yield buckets[1].callRemote("read", 0, 1024)), b"1" * 512 + b"2" * 512
|
||||
@ -257,10 +247,13 @@ class IStorageServerImmutableAPIsTestsMixin(object):
|
||||
self.assertEqual(
|
||||
(yield buckets[2].callRemote("read", 0, 1024)), b"3" * 512 + b"4" * 512
|
||||
)
|
||||
self.assertEqual(
|
||||
(yield buckets[3].callRemote("read", 0, 1024)),
|
||||
b"6" * 24 + b"7" * 1000,
|
||||
)
|
||||
|
||||
@skipIf(True, "https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3801")
|
||||
def test_overlapping_writes(self):
|
||||
"""
|
||||
The policy for overlapping writes is TBD:
|
||||
https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3801
|
||||
"""
|
||||
|
||||
@inlineCallbacks
|
||||
def test_get_buckets_skips_unfinished_buckets(self):
|
||||
|
Loading…
x
Reference in New Issue
Block a user