Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port control.py to Python 3 #977

Merged
merged 1 commit into from Feb 27, 2021
Merged

Port control.py to Python 3 #977

merged 1 commit into from Feb 27, 2021

Conversation

chadwhitacre
Copy link
Contributor

@chadwhitacre
Copy link
Contributor Author

CI

https://app.circleci.com/pipelines/github/tahoe-lafs/tahoe-lafs/1867/workflows/8291fff4-ea54-46a7-bb93-76b61ac7ab2d/jobs/44237

test_filesystem - allmydata.test.test_system.SystemTest
Traceback (most recent call last):
testtools.testresult.real._StringException: Traceback (most recent call last):
foolscap.tokens.RemoteException: <RemoteException around '[CopiedFailure instance: Traceback from remote host -- Traceback (most recent call last):
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/foolscap/eventual.py", line 26, in _turn
    cb(*args, **kwargs)
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/foolscap/broker.py", line 580, in doNextCall
    d.addCallback(self._callFinished, delivery)
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/twisted/internet/defer.py", line 322, in addCallback
    callbackKeywords=kw)
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/twisted/internet/defer.py", line 311, in addCallbacks
    self._runCallbacks()
--- <exception caught here> ---
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/twisted/internet/defer.py", line 654, in _runCallbacks
    current.result = callback(current.result, *args, **kw)
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/foolscap/broker.py", line 627, in _callFinished
    methodSchema.checkResults(res, False) # may raise Violation
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/foolscap/remoteinterface.py", line 297, in checkResults
    self.responseConstraint.checkObject(results, inbound)
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/foolscap/slicers/dict.py", line 146, in checkObject
    self.keyConstraint.checkObject(key, inbound)
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/foolscap/constraint.py", line 220, in checkObject
    raise Violation("'%r' is not a bytestring" % (obj,))
foolscap.tokens.Violation: Violation (in return value of <allmydata.control.ControlServer object at 0x7fd3b12133d0>.get_memory_usage): ("'u'VmData'' is not a bytestring",)
]'>

Local

(py27) $ gb
* 3605.port-control
  master
(py27) $ trial allmydata.test.test_system.SystemTest.test_filesystem
allmydata.test.test_system
  SystemTest
    test_filesystem ...                                                    [OK]

-------------------------------------------------------------------------------
Ran 1 tests in 53.894s

PASSED (successes=1)
(py27) $

🤔

@chadwhitacre
Copy link
Contributor Author

Mediocre coverage, 65%:

Name                                                 Stmts   Miss Branch BrPart  Cover   Missing
------------------------------------------------------------------------------------------------
src/allmydata/control.py                               234     76     64      8    65%   9->12, 26-43, 46-47, 54-55, 57-61, 63, 65-66, 72, 75-106, 109-121, 131, 191->192, 192, 211-215, 216->217, 217, 228->229, 229-231, 232->233, 233-235, 257->258, 258, 259->260, 260, 283->286, 286-287

https://github.com/tahoe-lafs/tahoe-lafs/pull/977/checks?check_run_id=1830656860#step:9:3457
https://github.com/tahoe-lafs/tahoe-lafs/pull/977/checks?check_run_id=1830656900#step:9:3490

Still getting some failures in CI though, which is good. All the reds are related, e.g.:

Traceback (most recent call last):
testtools.testresult.real._StringException: Traceback (most recent call last):
foolscap.tokens.RemoteException: <RemoteException around '[CopiedFailure instance: Traceback from remote host -- Traceback (most recent call last):
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/foolscap/eventual.py", line 26, in _turn
    cb(*args, **kwargs)
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/foolscap/broker.py", line 580, in doNextCall
    d.addCallback(self._callFinished, delivery)
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib64/python2.7/site-packages/twisted/internet/defer.py", line 322, in addCallback
    callbackKeywords=kw)
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib64/python2.7/site-packages/twisted/internet/defer.py", line 311, in addCallbacks
    self._runCallbacks()
--- <exception caught here> ---
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib64/python2.7/site-packages/twisted/internet/defer.py", line 654, in _runCallbacks
    current.result = callback(current.result, *args, **kw)
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/foolscap/broker.py", line 627, in _callFinished
    methodSchema.checkResults(res, False) # may raise Violation
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/foolscap/remoteinterface.py", line 297, in checkResults
    self.responseConstraint.checkObject(results, inbound)
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/foolscap/slicers/dict.py", line 146, in checkObject
    self.keyConstraint.checkObject(key, inbound)
  File "/tmp/tahoe-lafs.tox/py27-coverage/lib/python2.7/site-packages/foolscap/constraint.py", line 220, in checkObject
    raise Violation("'%r' is not a bytestring" % (obj,))
foolscap.tokens.Violation: Violation (in return value of <allmydata.control.ControlServer object at 0x7f6535a46c10>.get_memory_usage): ("'u'VmSize'' is not a bytestring",)
]'>

Not sure about the yellows ... 🤔

@chadwhitacre
Copy link
Contributor Author

Rebased on master, picking up some relevant changes in #978.

@coveralls
Copy link
Collaborator

Coverage Status

Coverage remained the same at 94.502% when pulling f660825 on 3605.port-control into 5e52c03 on master.

@chadwhitacre chadwhitacre marked this pull request as ready for review February 20, 2021 17:41
Copy link
Collaborator

@itamarst itamarst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@itamarst itamarst requested review from a team and removed request for meejah and exarkun February 22, 2021 14:42
@chadwhitacre chadwhitacre merged commit 701ce50 into master Feb 27, 2021
@chadwhitacre chadwhitacre deleted the 3605.port-control branch February 27, 2021 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants