Write tests for rust_install::component #45

brson · 2016-01-26T23:47:58Z

Basic tests for installation and uninstallation.

Fixed some bugs. Added validation of package installer versions.
Added validation of installed metadata format, bringing it closer
inline with what rust-installer produces. Added permission setting
on unix.

Tabs vs. spaces is screwy here. I'll submit a follow up that rustfmts master, merges master back into new, and rustfmts new.

I'm planning on writing tests for file system transactions next, then investigating the manifest code.

It's possible this branch will start diverging a lot from the master branch soon, and it'll get harder to keep them in sync. I'm not sure yet whether it's best to try to maintain continuity with the v1 manifest world, or consider this a new product and jettison the legacy stuff.

std::thread::sleep_ms has been deprecated in favor of std::thread::sleep with a std::time::Duration being passed as the argument. This updates all usage in this project of sleep_ms with sleep.

Fix deprecation warnings for sleep_ms

Basic tests for installation and uninstallation. Fixed some bugs. Added validation of package installer versions. Added validation of installed metadata format, bringing it closer inline with what rust-installer produces. Added permission setting on unix.

alexcrichton · 2016-01-26T23:57:32Z

You may want to make sure that these are running on both appveyor/travis, I think the top-level Cargo tests are being run but perhaps not the rust-install ones?

It also may make sense to start out these tests as integration tests in tests/ as they require lots of filesystem interaction, but that's just a stylistic choice on your behalf really

Diggsey · 2016-01-27T10:23:04Z

rust-install/src/component/components.rs

-	}
-	pub fn init(prefix: InstallPrefix) -> Result<Self> {
-		try!(utils::write_file("components", &prefix.manifest_file(COMPONENTS_FILE), ""));
-		Ok(Components { prefix: prefix })


Could you explain why init was removed? The new -> open and Option -> Result changes make sense, although the other "InstallPrefix wrappers" for lack of a better term should probably be refactored in the same way (Configuration and Manifestation). init was required for initializing an fresh install.

Huh, I thought I left a comment about this. It's because initializing the components file before any components are written, and outside of a transaction, could leave the installation in a partial state where nothing is installed but there is a rustlib/components file. Both 'components' and 'rust-installer-version' are initialized inside the transaction that installs the first component.

I didn't change Configuration and manifestation because I haven't started learning that code yet, but I can also change them today.

No problem - it was meant more as a note that we'll have to do it than as a criticism of the PR!

brson · 2016-01-27T18:45:45Z

Thanks for the review @Diggsey

brson · 2016-01-28T19:48:18Z

Here's the rustfmt PR against master. I've updated this PR to move the tests to the tests directory and run rustfmt over it. I'm going to continue writing tests for the transaction code now and will keep appending commits to this PR, then I will move on to learning the manifest code.

Diggsey · 2016-01-28T20:28:13Z

Incredible progress! I think @alexcrichton is right though: none of the rust_install tests seem to be running on travis.

Run rustfmt over everything

Conflicts: rust-install/src/errors.rs rust-install/src/install.rs rust-install/src/notify.rs rust-install/src/utils/mod.rs rust-install/src/utils/raw.rs

brson · 2016-01-29T06:36:16Z

Hm, the history on this PR looks weird with some other folks commits. I must have merged something wrong.

Edit: the extra commits are because this PR is against branch 'new' and I merged from 'master'.

brson · 2016-01-29T06:40:24Z

Uh oh. rustfmting everything made the combined diff useless...

brson · 2016-01-29T18:54:56Z

OK, I've addressed all the feedback. I'm not going to push more work to this branch because of the big diff already.

The appveyor build is having trouble linking openssl. Here are some of the errors:

libopenssl_sys-26ea9bf6206dbf1a.rlib(bio_ndef.obj) : warning LNK4099: PDB 'libMT.pdb' was not found with 'libopenssl_sys-26ea9bf6206dbf1a.rlib(bio_ndef.obj)' or at 'C:\projects\multirust-rs\target\debug\libMT.pdb'; linking object as if no debug info
libopenssl_sys-26ea9bf6206dbf1a.rlib(asn_mime.obj) : warning LNK4099: PDB 'libMT.pdb' was not found with 'libopenssl_sys-26ea9bf6206dbf1a.rlib(asn_mime.obj)' or at 'C:\projects\multirust-rs\target\debug\libMT.pdb'; linking object as if no debug info
libopenssl_sys-26ea9bf6206dbf1a.rlib(bio_asn1.obj) : warning LNK4099: PDB 'libMT.pdb' was not found with 'libopenssl_sys-26ea9bf6206dbf1a.rlib(bio_asn1.obj)' or at 'C:\projects\multirust-rs\target\debug\libMT.pdb'; linking object as if no debug info
libopenssl_sys-26ea9bf6206dbf1a.rlib(bio_b64.obj) : warning LNK4099: PDB 'libMT.pdb' was not found with 'libopenssl_sys-26ea9bf6206dbf1a.rlib(bio_b64.obj)' or at 'C:\projects\multirust-rs\target\debug\libMT.pdb'; linking object as if no debug info
libopenssl_sys-26ea9bf6206dbf1a.rlib(cryptlib.obj) : error LNK2019: unresolved external symbol __imp_GetUserObjectInformationW referenced in function OPENSSL_isservice
libopenssl_sys-26ea9bf6206dbf1a.rlib(cryptlib.obj) : error LNK2019: unresolved external symbol __imp_MessageBoxW referenced in function OPENSSL_showfatal
libopenssl_sys-26ea9bf6206dbf1a.rlib(rand_win.obj) : error LNK2019: unresolved external symbol __imp_CreateCompatibleBitmap referenced in function readscreen
libopenssl_sys-26ea9bf6206dbf1a.rlib(rand_win.obj) : error LNK2019: unresolved external symbol __imp_DeleteObject referenced in function readscreen
libopenssl_sys-26ea9bf6206dbf1a.rlib(rand_win.obj) : error LNK2019: unresolved external symbol __imp_GetDeviceCaps referenced in function readscreen
libopenssl_sys-26ea9bf6206dbf1a.rlib(rand_win.obj) : error LNK2019: unresolved external symbol __imp_GetDIBits referenced in function readscreen
libopenssl_sys-26ea9bf6206dbf1a.rlib(rand_win.obj) : error LNK2019: unresolved external symbol __imp_GetObjectW referenced in function readscreen
libopenssl_sys-26ea9bf6206dbf1a.rlib(rand_win.obj) : error LNK2019: unresolved external symbol __imp_GetDC referenced in function readscreen
libopenssl_sys-26ea9bf6206dbf1a.rlib(rand_win.obj) : error LNK2019: unresolved external symbol __imp_ReleaseDC referenced in function readscreen
C:\projects\multirust-rs\target\debug\deps\libshell32-d4cbd87c7e8d7b84.rlib : fatal error LNK1107: invalid or corrupt file: cannot read at 0x3120

error: aborting due to previous error
Could not compile `multirust-rs`.

It's using openssl from http://www.npcglib.org/~stathis/downloads/openssl-1.0.2d-vs2015.7z

alexcrichton · 2016-01-29T19:00:53Z

I think that may have to do with some of the old support in appveyor.yml. I believe this can now be fixed by emitting a .cargo/config that looks like:

[target.x86_64-pc-windows-msvc.openssl]
rustc-link-search = ['C:\OpenSSL\openssl-1.0.2d-vs2015\lib64']
rustc-link-libs = ['static=ssleay32MT', 'static=libeay32MT']
include = ['C:\OpenSSL\openssl-1.0.2d-vs2015\include']

[target.i686-pc-windows-msvc.openssl]
rustc-link-search = ['C:\OpenSSL\openssl-1.0.2d-vs2015\lib']
rustc-link-libs = ['static=ssleay32MT', 'static=libeay32MT']
include = ['C:\OpenSSL\openssl-1.0.2d-vs2015\include']

# ... etc

I think the GNU triples may also need some things there as well. Basically to statically link OpenSSL on Windows I think you'll want to use .cargo/config to override openssl-sys's build script

alexcrichton · 2016-01-29T20:13:20Z

I've opened a PR, but it looks like the cli.bat script still has some errors

Fix linkage errors on appveyor

brson · 2016-01-30T02:33:35Z

Thanks alex.

brson · 2016-01-30T02:44:44Z

OK, I tried to fix appveyor by adding cargo build --release as a test step so that the multirust bin ends up in the right place. If that's ok then this is good to go.

Write tests for rust_install::component

Diggsey · 2016-01-30T12:35:53Z

\o/

brson · 2016-01-30T17:50:57Z

Thanks Diggsey!

jwilm and others added 3 commits January 11, 2016 08:28

Fix deprecation warnings for sleep_ms

793445a

std::thread::sleep_ms has been deprecated in favor of std::thread::sleep with a std::time::Duration being passed as the argument. This updates all usage in this project of sleep_ms with sleep.

Merge pull request #40 from jwilm/fix-deprecation-warnings

abb069a

Fix deprecation warnings for sleep_ms

Diggsey reviewed Jan 27, 2016
View reviewed changes

brson added 3 commits January 28, 2016 19:38

Run rustfmt over everything

1a9c904

rustfmt

5467c8a

Move rust-install tests to tests directory

17697bd

brson and others added 5 commits January 28, 2016 12:49

Merge pull request #47 from brson/rustfmt

0a22098

Run rustfmt over everything

Merge remote-tracking branch 'origin/master' into next

a5ba85e

Conflicts: rust-install/src/errors.rs rust-install/src/install.rs rust-install/src/notify.rs rust-install/src/utils/mod.rs rust-install/src/utils/raw.rs

Test rust-install and rust-manifest on Travis/AppVeyor

da7e6fb

Add a comment about why we set file permissions

0b4d5a3

Use more descriptive error names

bac51c1

Temporarily ignore a test on windows

de07431

Try to get windows appveyor working

7943431

Merge pull request #1 from alexcrichton/fix-windows

44b294c

Fix linkage errors on appveyor

Fix appveyor tests

77b300c

Diggsey added a commit that referenced this pull request Jan 30, 2016

Merge pull request #45 from brson/next

2d3e3f9

Write tests for rust_install::component

Diggsey merged commit 2d3e3f9 into rust-lang:new Jan 30, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Write tests for rust_install::component #45

Write tests for rust_install::component #45

brson commented Jan 26, 2016

alexcrichton commented Jan 26, 2016

Diggsey Jan 27, 2016

brson Jan 27, 2016

brson Jan 27, 2016

Diggsey Jan 27, 2016

brson commented Jan 27, 2016

brson commented Jan 28, 2016

Diggsey commented Jan 28, 2016

brson commented Jan 29, 2016

brson commented Jan 29, 2016

brson commented Jan 29, 2016

alexcrichton commented Jan 29, 2016

alexcrichton commented Jan 29, 2016

brson commented Jan 30, 2016

brson commented Jan 30, 2016

Diggsey commented Jan 30, 2016

brson commented Jan 30, 2016

Write tests for rust_install::component #45

Write tests for rust_install::component #45

Conversation

brson commented Jan 26, 2016

alexcrichton commented Jan 26, 2016

Diggsey Jan 27, 2016

Choose a reason for hiding this comment

brson Jan 27, 2016

Choose a reason for hiding this comment

brson Jan 27, 2016

Choose a reason for hiding this comment

Diggsey Jan 27, 2016

Choose a reason for hiding this comment

brson commented Jan 27, 2016

brson commented Jan 28, 2016

Diggsey commented Jan 28, 2016

brson commented Jan 29, 2016

brson commented Jan 29, 2016

brson commented Jan 29, 2016

alexcrichton commented Jan 29, 2016

alexcrichton commented Jan 29, 2016

brson commented Jan 30, 2016

brson commented Jan 30, 2016

Diggsey commented Jan 30, 2016

brson commented Jan 30, 2016