diff options
| author |  lberki <lberki@google.com> | 2018-02-15 01:18:23 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-15 01:20:11 -0800 |
| commit | e9c885a88137fa10ea0ac95ff33dcfdc79c6cf0a (patch) | |
| tree | ab659dd61c32440be620319bad64f55cec09320d /src/test/java/com/google/devtools/build | |
| parent | 0a8dde0a64c3eea0a5b93560cdacc66db4a6885c (diff) | |
Automated rollback of commit fa0fac2a4e8a2e5c01b8390878289d00dcc17dba.
*** Reason for rollback ***
Remove example changes; those need to build with the last Bazel release.
*** Original change description ***
Automated rollback of commit 0f9c6ea574918dda094cf5423fa3822112846c30.
*** Reason for rollback ***
Breaks Kokoro and I accidentally submitted the change without presubmit checks.
*** Original change description ***
Make __init__.py files creation optional
Introduce a new attribute to py_binary and py_test to control whether to
create `__init__.py` or not.
Fixes https://github.com/bazelbuild/rules_python/issues/55
Closes #4470.
PiperOrigin-RevId: 185806241
Diffstat (limited to 'src/test/java/com/google/devtools/build')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java index 61dd892ff6..2a86f2ff2f 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java @@ -1449,9 +1449,9 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { scratch.file( "test/BUILD", "load('//test:rule.bzl', 'skylark_rule')", - "py_library(name = 'lib', srcs = ['a.py', 'b.py'])", + "py_binary(name = 'lib', srcs = ['lib.py', 'lib2.py'])", "skylark_rule(name = 'foo', dep = ':lib')", - "py_library(name = 'lib_with_init', srcs = ['a.py', 'b.py', '__init__.py'])", + "py_binary(name = 'lib_with_init', srcs = ['lib_with_init.py', 'lib2.py', '__init__.py'])", "skylark_rule(name = 'foo_with_init', dep = ':lib_with_init')"); SkylarkRuleContext ruleContext = createRuleContext("//test:foo"); @@ -1460,13 +1460,13 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { ruleContext, "[f.short_path for f in ruleContext.attr.dep.default_runfiles.files]"); assertThat(filenames).isInstanceOf(SkylarkList.class); SkylarkList filenamesList = (SkylarkList) filenames; - assertThat(filenamesList).containsExactly("test/a.py", "test/b.py").inOrder(); + assertThat(filenamesList).containsAllOf("test/lib.py", "test/lib2.py"); Object emptyFilenames = evalRuleContextCode( ruleContext, "list(ruleContext.attr.dep.default_runfiles.empty_filenames)"); assertThat(emptyFilenames).isInstanceOf(SkylarkList.class); SkylarkList emptyFilenamesList = (SkylarkList) emptyFilenames; - assertThat(emptyFilenamesList).containsExactly("test/__init__.py").inOrder(); + assertThat(emptyFilenamesList).containsExactly("test/__init__.py"); SkylarkRuleContext ruleWithInitContext = createRuleContext("//test:foo_with_init"); Object noEmptyFilenames = |