PR#395: Send source mtime to dist-git - rpkg

rpkg

#395 Send source mtime to dist-git

Merged 5 years ago by lsedlar. Opened 5 years ago by lsedlar.

lsedlar/rpkg source-mtime into master

Send source mtime to dist-git

Lubomír Sedlář • 5 years ago

161cd10

pyrpkg/lookaside.py

file modified

+6 -3

		`@@ -291,9 +291,12 @@`
		`return`

		`self.log.info("Uploading: %s", filepath)`
		`- post_data = [('name', name),`
		`- ('%ssum' % self.hashtype, hash),`
		`- ('file', (pycurl.FORM_FILE, filepath))]`
		`+ post_data = [`
		`+ ('name', name),`
		`+ ('%ssum' % self.hashtype, hash),`
		`+ ('file', (pycurl.FORM_FILE, filepath)),`
		`+ ('mtime', str(int(os.stat(filepath).st_mtime))),`
		`+ ]`

		`with io.BytesIO() as buf:`
		`c = pycurl.Curl()`

tests/test_lookaside.py

file modified

+24 -3

		`@@ -20,6 +20,16 @@`
		`from pyrpkg.errors import DownloadError, InvalidHashType, UploadError`


		`+ old_stat = os.stat`
		`+`
		`+`
		`+ def mock_stat(path):`
		`+ """Fake mtime for tarballs, but keep stat working for any other file."""`
		`+ if path.endswith(".tar.xz"):`
		`+ return mock.Mock(st_mtime=1234)`
		`+ return old_stat(path)`
		`+`
		`+`
		`class CGILookasideCacheTestCase(unittest.TestCase):`
		`def setUp(self):`
		`self.workdir = tempfile.mkdtemp(prefix='rpkg-tests.')`
		`@@ -450,6 +460,7 @@`
		`self.assertRaises(UploadError, lc.remote_file_exists, 'pyrpkg',`
		`'pyrpkg-0.tar.xz', 'thehash')`

		`+ @mock.patch('os.stat', new=mock_stat)`
		`@mock.patch('pyrpkg.lookaside.logging.getLogger')`
		`@mock.patch('pyrpkg.lookaside.pycurl.Curl')`
		`def test_upload(self, mock_curl, mock_logger):`
		`@@ -478,9 +489,15 @@`
		`lc.upload('pyrpkg', 'pyrpkg-0.0.tar.xz', 'thehash')`

		`self.assertTrue(pycurl.HTTPPOST in curlopts)`
		`- self.assertEqual(curlopts[pycurl.HTTPPOST], [`
		`- ('name', 'pyrpkg'), ('sha512sum', 'thehash'),`
		`- ('file', (pycurl.FORM_FILE, 'pyrpkg-0.0.tar.xz'))])`
		`+ self.assertEqual(`
		`+ curlopts[pycurl.HTTPPOST],`
		`+ [`
		`+ ('name', 'pyrpkg'),`
		`+ ('sha512sum', 'thehash'),`
		`+ ('file', (pycurl.FORM_FILE, 'pyrpkg-0.0.tar.xz')),`
		`+ ('mtime', '1234'),`
		`+ ],`
		`+ )`

		`self.assertEqual(debug_messages, [b'Some output'])`

		`@@ -497,6 +514,7 @@`
		`self.assertEqual(curl.perform.call_count, 0)`
		`self.assertEqual(curl.setopt.call_count, 0)`

		`+ @mock.patch('os.stat', new=mock_stat)`
		`@mock.patch('pyrpkg.lookaside.pycurl.Curl')`
		`def test_upload_with_custom_certs(self, mock_curl):`
		`def mock_setopt(opt, value):`
		`@@ -524,6 +542,7 @@`
		`self.assertEqual(curlopts[pycurl.SSLCERT], client_cert)`
		`self.assertEqual(curlopts[pycurl.CAINFO], ca_cert)`

		`+ @mock.patch('os.stat', new=mock_stat)`
		`@mock.patch('pyrpkg.lookaside.logging.getLogger')`
		`@mock.patch('pyrpkg.lookaside.pycurl.Curl')`
		`def test_upload_missing_custom_certs(self, mock_curl, mock_logger):`
		`@@ -557,6 +576,7 @@`
		`self.assertTrue('Missing certificate: ' in warn_messages[0])`
		`self.assertTrue('Missing certificate: ' in warn_messages[1])`

		`+ @mock.patch('os.stat', new=mock_stat)`
		`@mock.patch('pyrpkg.lookaside.pycurl.Curl')`
		`def test_upload_failed(self, mock_curl):`
		`curl = mock_curl.return_value`
		`@@ -569,6 +589,7 @@`
		`self.assertRaises(UploadError, lc.upload, 'pyrpkg',`
		`'pyrpkg-0.tar.xz', 'thehash')`

		`+ @mock.patch('os.stat', new=mock_stat)`
		`@mock.patch('pyrpkg.lookaside.pycurl.Curl')`
		`def test_upload_failed_status_code(self, mock_curl):`
		`def mock_setopt(opt, value):`