Skip to content

Commit de4150e

Browse files
committed
potential fixes
1 parent c106bf7 commit de4150e

File tree

2 files changed

+13
-21
lines changed

2 files changed

+13
-21
lines changed

dockerfiles/entrypoint.sh

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ while true; do
2727
done
2828
set -e
2929

30-
cratesfyi database update-release-activity
31-
3230
if ! [ -d "${CRATESFYI_PREFIX}/crates.io-index/.git" ]; then
3331
git clone https://github.com/rust-lang/crates.io-index "${CRATESFYI_PREFIX}/crates.io-index"
3432
# Prevent new crates built before the container creation to be built

src/docbuilder/rustwide_builder.rs

+13-19
Original file line numberDiff line numberDiff line change
@@ -764,25 +764,13 @@ mod tests {
764764
#[ignore]
765765
fn test_build_crate() {
766766
wrapper(|env| {
767-
let crate_ = "log";
768-
let version = "0.4.14";
769767
let default_target = "x86_64-unknown-linux-gnu";
770768

771769
assert_eq!(env.config().include_default_targets, true);
772770

773-
// env.fake_release()
774-
// .name(crate_)
775-
// .version(version)
776-
// .default_target(default_target)
777-
// .add_target("i686-pc-windows-msvc")
778-
// .add_target("i686-unknown-linux-gnu")
779-
// .add_target("x86_64-apple-darwin")
780-
// .add_target("x86_64-pc-windows-msvc")
781-
// .create()?;
782-
783771
let mut builder = RustwideBuilder::init(env).unwrap();
784772
builder
785-
.build_package(crate_, version, PackageKind::CratesIo)
773+
.build_package(DUMMY_CRATE_NAME, DUMMY_CRATE_VERSION, PackageKind::CratesIo)
786774
.map(|_| ())?;
787775

788776
// check release record in the db (default and other targets)
@@ -799,7 +787,7 @@ mod tests {
799787
WHERE
800788
c.name = $1 AND
801789
r.version = $2",
802-
&[&crate_, &version],
790+
&[&DUMMY_CRATE_NAME, &DUMMY_CRATE_VERSION],
803791
)
804792
.unwrap();
805793
let row = rows.get(0).unwrap();
@@ -818,15 +806,21 @@ mod tests {
818806
);
819807

820808
let storage = env.storage();
821-
let base = format!("rustdoc/{}/{}", crate_, version);
809+
let base = format!("rustdoc/{}/{}", DUMMY_CRATE_NAME, DUMMY_CRATE_VERSION);
822810

823-
// default target was build
824-
assert!(storage.exists(&format!("{}/index.html", base))?);
811+
// default target was built
812+
assert!(storage.exists(&format!("{}/{}/index.html", DUMMY_CRATE_NAME, base))?);
825813

826814
// other targets too
827815
for target in DEFAULT_TARGETS {
828-
if target != &default_target {
829-
assert!(storage.exists(&format!("{}/{}/index.html", base, target))?);
816+
let target_docs_present = storage.exists(&format!(
817+
"{}/{}/{}/index.html",
818+
base, DUMMY_CRATE_NAME, target
819+
))?;
820+
if target == &default_target {
821+
assert!(!target_docs_present);
822+
} else {
823+
assert!(target_docs_present);
830824
}
831825
}
832826

0 commit comments

Comments
 (0)